aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses/i2c-designware-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.c')
-rw-r--r--drivers/i2c/busses/i2c-designware-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index c41ca6354fc5..db20a2841b75 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -580,14 +580,13 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
580 i2c_dw_xfer_init(dev); 580 i2c_dw_xfer_init(dev);
581 581
582 /* wait for tx to complete */ 582 /* wait for tx to complete */
583 ret = wait_for_completion_interruptible_timeout(&dev->cmd_complete, HZ); 583 ret = wait_for_completion_timeout(&dev->cmd_complete, HZ);
584 if (ret == 0) { 584 if (ret == 0) {
585 dev_err(dev->dev, "controller timed out\n"); 585 dev_err(dev->dev, "controller timed out\n");
586 i2c_dw_init(dev); 586 i2c_dw_init(dev);
587 ret = -ETIMEDOUT; 587 ret = -ETIMEDOUT;
588 goto done; 588 goto done;
589 } else if (ret < 0) 589 }
590 goto done;
591 590
592 if (dev->msg_err) { 591 if (dev->msg_err) {
593 ret = dev->msg_err; 592 ret = dev->msg_err;