i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg

If there is a signal pending and wait_for_completion_interruptible_timeout
terminates with -ERESTARTSYS, we return and disable the i2c clocks in
omap_i2c_xfer.

If we terminate before sending last i2c message with a stop condition, the
bus remains busy and we are not able to send new messages into bus with
successive omap_i2c_xfer calls. Therefore a pending signal is not caught
here and we return only because of timeout or i2c error.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 608038d64f81..17476ecd9782 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -328,8 +328,12 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
                 w |= OMAP_I2C_CON_STP;
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
 
-        r = wait_for_completion_interruptible_timeout(&dev->cmd_complete,
-                                                      OMAP_I2C_TIMEOUT);
+        /*
+         * 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);
         dev->buf_len = 0;
         if (r < 0)
                 return r;