diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-24 00:18:40 +0200 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /drivers/i2c/algos/i2c-algo-bit.c | |
| parent | Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 in... (diff) | |
| parent | IXP4xx: support for Goramo MultiLink router platform. (diff) | |
| download | linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.tar.xz linux-fc05505b77f7900a1bb74fb3f3a4343dee4265a4.zip | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
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) * chips may hold it low ("clock stretching") while they * are processing data internally. */ - if (time_after_eq(jiffies, start + adap->timeout)) + if (time_after(jiffies, start + adap->timeout)) return -ETIMEDOUT; cond_resched(); } |