Merge commit 'v3.3' into fbdev-next

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 525c7345fa0b..24f94f4ae395 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -103,8 +103,14 @@ 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(jiffies, start + adap->timeout))
+                if (time_after(jiffies, start + adap->timeout)) {
+                        /* Test one last time, as we may have been preempted
+                         * between last check and timeout test.
+                         */
+                        if (getscl(adap))
+                                break;
                         return -ETIMEDOUT;
+                }
                 cond_resched();
         }
 #ifdef DEBUG