diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-04-23 16:27:39 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-05-03 22:54:23 +0100 |
| commit | d10db3a07e38bfb1bff92c790072d85b0bcc07eb (patch) | |
| tree | 8cfbe18a5d164d02b9fcce64fda01e777a1d655b /drivers/i2c/busses/i2c-pxa.c | |
| parent | 091438dd5668396328a3419abcbc6591159eb8d1 (diff) | |
| download | kernel_samsung_aries-d10db3a07e38bfb1bff92c790072d85b0bcc07eb.zip kernel_samsung_aries-d10db3a07e38bfb1bff92c790072d85b0bcc07eb.tar.gz kernel_samsung_aries-d10db3a07e38bfb1bff92c790072d85b0bcc07eb.tar.bz2 | |
i2c-pxa.c: timeouts off by 1
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-pxa.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pxa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index c1405c8..acc7143 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -265,10 +265,10 @@ static int i2c_pxa_wait_bus_not_busy(struct pxa_i2c *i2c) show_state(i2c); } - if (timeout <= 0) + if (timeout < 0) 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) @@ -612,7 +612,7 @@ static int i2c_pxa_pio_set_master(struct pxa_i2c *i2c) show_state(i2c); } - if (timeout <= 0) { + if (timeout < 0) { show_state(i2c); dev_err(&i2c->adap.dev, "i2c_pxa: timeout waiting for bus free\n"); |