1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index d09512e4f488..c6db76ec5a22 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -615,11 +615,10 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
         if (dev->cmd_err & OMAP_I2C_STAT_NACK) {
                 if (msg->flags & I2C_M_IGNORE_NAK)
                         return 0;
-                if (stop) {
-                        w = omap_i2c_read_reg(dev, OMAP_I2C_CON_REG);
-                        w |= OMAP_I2C_CON_STP;
-                        omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
-                }
+
+                w = omap_i2c_read_reg(dev, OMAP_I2C_CON_REG);
+                w |= OMAP_I2C_CON_STP;
+                omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, w);
                 return -EREMOTEIO;
         }
         return -EIO;