Merge branch 'master' of git://git.denx.de/u-boot-i2c

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index a72d1a1..fab49fd 100644 (file)
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -329,7 +329,7 @@ int i2c_probe (uchar chip)
 
        while (1) {
                status = wait_for_pin();
-               if (status == 0) {
+               if (status == 0 || status & I2C_STAT_AL) {
                        res = 1;
                        goto probe_exit;
                }