dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

i2c-pxa.c: timeouts off by 1

Browse source 
With `while (timeout--)' timeout reaches -1 after the loop, so the tests
below are off by one.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
Roel Kluin 2009-04-23 16:27:39 +02:00 committed by Ben Dooks
parent 091438dd56
commit d10db3a07e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/i2c/busses/i2c-pxa.c
View file

@ -265,10 +265,10 @@ static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c)
show_state(i2c); show_state(i2c);
} }
if (timeout <= 0) if (timeout < 0)
show_state(i2c); show_state(i2c);
return timeout <= 0 ? I2C_RETRY : 0; return timeout < 0 ? I2C_RETRY : 0;
} }
static int i2c_pxa_wait_master(struct pxa_i2c *i2c) static int i2c_pxa_wait_master(struct pxa_i2c *i2c)
@ -612,7 +612,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c)
show_state(i2c); show_state(i2c);
} }
if (timeout <= 0) { if (timeout < 0) {
show_state(i2c); show_state(i2c);
dev_err(&i2c->adap.dev, dev_err(&i2c->adap.dev,
"i2c_pxa: timeout waiting for bus free\n"); "i2c_pxa: timeout waiting for bus free\n");