diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:27:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 08:27:14 -0700 |
| commit | f328ddc154605be11c4ca38fee6ace8adb140087 (patch) | |
| tree | 53589963a1b6af22d0a26db7ab1e03dfeedb2b89 /drivers/i2c/busses/i2c-nforce2.c | |
| parent | 80445de57764b45fc26315c19fe7dc9fc57c2c65 (diff) | |
| parent | 2196d1cf4afab93fb64c2e5b417096e49b661612 (diff) | |
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c-algo-pca: Let PCA9564 recover from unacked data byte (state 0x30)
i2c-algo-bit: Fix timeout test
i2c: Timeouts off by 1
Diffstat (limited to 'drivers/i2c/busses/i2c-nforce2.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-nforce2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 2ff4683703a..ec11d1c4e77 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c @@ -173,7 +173,7 @@ static int nforce2_check_status(struct i2c_adapter *adap) temp = inb_p(NVIDIA_SMB_STS); } while ((!temp) && (timeout++ < MAX_TIMEOUT)); - if (timeout >= MAX_TIMEOUT) { + if (timeout > MAX_TIMEOUT) { dev_dbg(&adap->dev, "SMBus Timeout!\n"); if (smbus->can_abort) nforce2_abort(adap); |