1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 96fd528e888a..4af123fab63c 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -853,24 +853,21 @@ omap_i2c_isr(int this_irq, void *dev_id)
                 dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);
                 if (count++ == 100) {
                         dev_warn(dev->dev, "Too much work in one IRQ\n");
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
 
 complete:
                 if (stat & OMAP_I2C_STAT_NACK) {
                         err |= OMAP_I2C_STAT_NACK;
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
 
                 if (stat & OMAP_I2C_STAT_AL) {
                         dev_err(dev->dev, "Arbitration lost\n");
                         err |= OMAP_I2C_STAT_AL;
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
 
                 /*
@@ -883,8 +880,7 @@ complete:
                                                 OMAP_I2C_STAT_XRDY |
                                                 OMAP_I2C_STAT_XDR |
                                                 OMAP_I2C_STAT_ARDY));
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
 
                 if (stat & OMAP_I2C_STAT_RDR) {
@@ -949,19 +945,19 @@ complete:
                         dev_err(dev->dev, "Receive overrun\n");
                         err |= OMAP_I2C_STAT_ROVR;
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_ROVR);
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
 
                 if (stat & OMAP_I2C_STAT_XUDF) {
                         dev_err(dev->dev, "Transmit underflow\n");
                         err |= OMAP_I2C_STAT_XUDF;
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XUDF);
-                        omap_i2c_complete_cmd(dev, err);
-                        return IRQ_HANDLED;
+                        goto out;
                 }
         } while (stat);
 
+out:
+        omap_i2c_complete_cmd(dev, err);
         return IRQ_HANDLED;
 }