diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2012-06-13 04:22:42 -0400 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-07-13 02:27:31 -0400 |
commit | a25733d6f6968240042ac94dc93c7ae3c9e8d68b (patch) | |
tree | 3db858d155f0cd052613d963f2f96102c1470c6e /drivers/i2c | |
parent | a20a64d226be36808b24d2205b5d35e80c49e8be (diff) |
i2c: i2c-bfin-twi: Break dead waiting loop if i2c device misbehaves.
Some fault i2c device may hold the sda/scl line and cause i2c driver
wait in the BUS busy loop. The I2C framework already retry the
transfer loop before timeout. Return -EAGAIN instead of pull BUSBUSY
in the other loop.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-bfin-twi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index 4799c6886946..5fb5f3ee13a2 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c | |||
@@ -307,8 +307,8 @@ static int bfin_twi_do_master_xfer(struct i2c_adapter *adap, | |||
307 | if (!(read_CONTROL(iface) & TWI_ENA)) | 307 | if (!(read_CONTROL(iface) & TWI_ENA)) |
308 | return -ENXIO; | 308 | return -ENXIO; |
309 | 309 | ||
310 | while (read_MASTER_STAT(iface) & BUSBUSY) | 310 | if (read_MASTER_STAT(iface) & BUSBUSY) |
311 | yield(); | 311 | return -EAGAIN; |
312 | 312 | ||
313 | iface->pmsg = msgs; | 313 | iface->pmsg = msgs; |
314 | iface->msg_num = num; | 314 | iface->msg_num = num; |
@@ -407,8 +407,8 @@ int bfin_twi_do_smbus_xfer(struct i2c_adapter *adap, u16 addr, | |||
407 | if (!(read_CONTROL(iface) & TWI_ENA)) | 407 | if (!(read_CONTROL(iface) & TWI_ENA)) |
408 | return -ENXIO; | 408 | return -ENXIO; |
409 | 409 | ||
410 | while (read_MASTER_STAT(iface) & BUSBUSY) | 410 | if (read_MASTER_STAT(iface) & BUSBUSY) |
411 | yield(); | 411 | return -EAGAIN; |
412 | 412 | ||
413 | iface->writeNum = 0; | 413 | iface->writeNum = 0; |
414 | iface->readNum = 0; | 414 | iface->readNum = 0; |