diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-26 20:55:39 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-26 20:55:39 +0200 |
| commit | 90d8cff09918f1fdf15cdb4e6c55fb1712340710 (patch) | |
| tree | 71da1f5595fa04bd2563b5d71149d0e65f5bde1d | |
| parent | 8c0c2b905078b9733a3830f108dca7bfab41d369 (diff) | |
| parent | 4df66894954ec6411d22e3a86070014d74bafb5c (diff) | |
| download | u-boot-midas-90d8cff09918f1fdf15cdb4e6c55fb1712340710.tar.gz u-boot-midas-90d8cff09918f1fdf15cdb4e6c55fb1712340710.tar.bz2 u-boot-midas-90d8cff09918f1fdf15cdb4e6c55fb1712340710.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
| -rw-r--r-- | drivers/i2c/omap24xx_i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index a72d1a1257..fab49fd969 100644 --- 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; } |