1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index f33bc5a55074..5d4bad44d370 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -775,6 +775,17 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev)
                 if (stat & (OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) {
                         omap_i2c_ack_stat(dev, (OMAP_I2C_STAT_XRDY |
                                                         OMAP_I2C_STAT_XDR));
+                        if (stat & OMAP_I2C_STAT_NACK) {
+                                dev->cmd_err |= OMAP_I2C_STAT_NACK;
+                                omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
+                        }
+
+                        if (stat & OMAP_I2C_STAT_AL) {
+                                dev_err(dev->dev, "Arbitration lost\n");
+                                dev->cmd_err |= OMAP_I2C_STAT_AL;
+                                omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
+                        }
+
                         return -EIO;
                 }
 
@@ -875,7 +886,6 @@ omap_i2c_isr(int this_irq, void *dev_id)
                         goto out;
                 }
 
-complete:
                 if (stat & OMAP_I2C_STAT_NACK) {
                         err |= OMAP_I2C_STAT_NACK;
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
@@ -938,7 +948,7 @@ complete:
                         ret = omap_i2c_transmit_data(dev, num_bytes, true);
                         stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
                         if (ret < 0)
-                                goto complete;
+                                goto out;
 
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR);
                         continue;
@@ -954,7 +964,7 @@ complete:
                         ret = omap_i2c_transmit_data(dev, num_bytes, false);
                         stat = omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
                         if (ret < 0)
-                                goto complete;
+                                goto out;
 
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XRDY);
                         continue;