Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i2c-pca: Fix waitforcompletion() return value

Browse source 
ret is still -1, if during the polling read_byte() returns at once
with I2C_PCA_CON_SI set. So ret > 0 would lead *_waitforcompletion()
to return 0, in spite of the proper behavior.

The routine was rewritten, so that ret has always a proper value,
before returning.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: stable@kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
This commit is contained in:
Yegor Yefremov 2010-09-30 14:14:22 +02:00 committed by Jean Delvare
parent 753419f59e
commit 6abb930af0
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/i2c/busses/i2c-pca-isa.c
View file

@ -71,8 +71,8 @@ static int pca_isa_readbyte(void *pd, int reg)
static int pca_isa_waitforcompletion(void *pd) static int pca_isa_waitforcompletion(void *pd)
{ {
long ret = ~0;
unsigned long timeout; unsigned long timeout;
long ret;
if (irq > -1) { if (irq > -1) {
ret = wait_event_timeout(pca_wait, ret = wait_event_timeout(pca_wait,
@ -81,11 +81,15 @@ static int pca_isa_waitforcompletion(void *pd)
} else { } else {
/* Do polling */ /* Do polling */
timeout = jiffies + pca_isa_ops.timeout; timeout = jiffies + pca_isa_ops.timeout;
while (((pca_isa_readbyte(pd, I2C_PCA_CON) do {
& I2C_PCA_CON_SI) == 0) ret = time_before(jiffies, timeout);
&& (ret = time_before(jiffies, timeout))) if (pca_isa_readbyte(pd, I2C_PCA_CON)
& I2C_PCA_CON_SI)
break;
udelay(100); udelay(100);
} while (ret);
} }
return ret > 0; return ret > 0;
} }

11
drivers/i2c/busses/i2c-pca-platform.c
View file

@ -80,8 +80,8 @@ static void i2c_pca_pf_writebyte32(void *pd, int reg, int val)
static int i2c_pca_pf_waitforcompletion(void *pd) static int i2c_pca_pf_waitforcompletion(void *pd)
{ {
struct i2c_pca_pf_data *i2c = pd; struct i2c_pca_pf_data *i2c = pd;
long ret = ~0;
unsigned long timeout; unsigned long timeout;
long ret;
if (i2c->irq) { if (i2c->irq) {
ret = wait_event_timeout(i2c->wait, ret = wait_event_timeout(i2c->wait,
@ -90,10 +90,13 @@ static int i2c_pca_pf_waitforcompletion(void *pd)
} else { } else {
/* Do polling */ /* Do polling */
timeout = jiffies + i2c->adap.timeout; timeout = jiffies + i2c->adap.timeout;
while (((i2c->algo_data.read_byte(i2c, I2C_PCA_CON) do {
& I2C_PCA_CON_SI) == 0) ret = time_before(jiffies, timeout);
&& (ret = time_before(jiffies, timeout))) if (i2c->algo_data.read_byte(i2c, I2C_PCA_CON)
& I2C_PCA_CON_SI)
break;
udelay(100); udelay(100);
} while (ret);
} }
return ret > 0; return ret > 0;