|
|
@@ -368,8 +368,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
|
|
|
flag |= DAVINCI_I2C_MDR_STP;
|
|
|
davinci_i2c_write_reg(dev, DAVINCI_I2C_MDR_REG, flag);
|
|
|
|
|
|
- r = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
|
|
|
- dev->adapter.timeout);
|
|
|
+ r = wait_for_completion_timeout(&dev->cmd_complete, dev->adapter.timeout);
|
|
|
if (r == 0) {
|
|
|
dev_err(dev->dev, "controller timed out\n");
|
|
|
davinci_i2c_recover_bus(dev);
|
|
|
@@ -380,7 +379,6 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
|
|
|
if (dev->buf_len) {
|
|
|
/* This should be 0 if all bytes were transferred
|
|
|
* or dev->cmd_err denotes an error.
|
|
|
- * A signal may have aborted the transfer.
|
|
|
*/
|
|
|
if (r >= 0) {
|
|
|
dev_err(dev->dev, "abnormal termination buf_len=%i\n",
|