ret is still -1, if during the polling read_byte() returns at once with I2C_PCA_CON_SI set. So ret > 0 would lead i2c_pca_pf_waitforcompletion() to return 0, in spite of the proper behavior.
Solution: get rid of ret and make immediate return where possible. Signed-off-by: Yegor Yefremov <[email protected]> Index: b/drivers/i2c/busses/i2c-pca-platform.c =================================================================== --- a/drivers/i2c/busses/i2c-pca-platform.c 2010-09-21 10:53:46.000000000 +0200 +++ b/drivers/i2c/busses/i2c-pca-platform.c 2010-09-21 10:59:18.000000000 +0200 @@ -80,23 +80,26 @@ static int i2c_pca_pf_waitforcompletion(void *pd) { struct i2c_pca_pf_data *i2c = pd; - long ret = ~0; unsigned long timeout; if (i2c->irq) { - ret = wait_event_timeout(i2c->wait, + return wait_event_timeout(i2c->wait, i2c->algo_data.read_byte(i2c, I2C_PCA_CON) & I2C_PCA_CON_SI, i2c->adap.timeout); } else { /* Do polling */ timeout = jiffies + i2c->adap.timeout; - while (((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) - & I2C_PCA_CON_SI) == 0) - && (ret = time_before(jiffies, timeout))) - udelay(100); + while (!(i2c->algo_data.read_byte(i2c, I2C_PCA_CON) + & I2C_PCA_CON_SI)) + { + if(time_before(jiffies, timeout)) + udelay(100); + else + return 0; + } } - return ret > 0; + return ~0; } static void i2c_pca_pf_dummyreset(void *pd) -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
