diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:27:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:27:14 -0400 |
| commit | f328ddc154605be11c4ca38fee6ace8adb140087 (patch) | |
| tree | 53589963a1b6af22d0a26db7ab1e03dfeedb2b89 /drivers/i2c/algos/i2c-algo-bit.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/algos/i2c-algo-bit.c')
| -rw-r--r-- | drivers/i2c/algos/i2c-algo-bit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index d420cc5f5633..e25e13980af3 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
| @@ -104,7 +104,7 @@ static int sclhi(struct i2c_algo_bit_data *adap) | |||
| 104 | * chips may hold it low ("clock stretching") while they | 104 | * chips may hold it low ("clock stretching") while they |
| 105 | * are processing data internally. | 105 | * are processing data internally. |
| 106 | */ | 106 | */ |
| 107 | if (time_after_eq(jiffies, start + adap->timeout)) | 107 | if (time_after(jiffies, start + adap->timeout)) |
| 108 | return -ETIMEDOUT; | 108 | return -ETIMEDOUT; |
| 109 | cond_resched(); | 109 | cond_resched(); |
| 110 | } | 110 | } |