|
@@ -473,7 +473,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
|
|
|
struct i2c_msg *msg, int stop)
|
|
|
{
|
|
|
struct omap_i2c_dev *dev = i2c_get_adapdata(adap);
|
|
|
- int r;
|
|
|
+ unsigned long timeout;
|
|
|
u16 w;
|
|
|
|
|
|
dev_dbg(dev->dev, "addr: 0x%04x, len: %d, flags: 0x%x, stop: %d\n",
|
|
@@ -541,12 +541,10 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
|
|
|
* REVISIT: We should abort the transfer on signals, but the bus goes
|
|
|
* into arbitration and we're currently unable to recover from it.
|
|
|
*/
|
|
|
- r = wait_for_completion_timeout(&dev->cmd_complete,
|
|
|
- OMAP_I2C_TIMEOUT);
|
|
|
+ timeout = wait_for_completion_timeout(&dev->cmd_complete,
|
|
|
+ OMAP_I2C_TIMEOUT);
|
|
|
dev->buf_len = 0;
|
|
|
- if (r < 0)
|
|
|
- return r;
|
|
|
- if (r == 0) {
|
|
|
+ if (timeout == 0) {
|
|
|
dev_err(dev->dev, "controller timed out\n");
|
|
|
omap_i2c_init(dev);
|
|
|
return -ETIMEDOUT;
|