Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a9bf4ca78bb9..3ee188679cf1 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -803,7 +803,7 @@ static int errata_omap3_i462(struct omap_i2c_dev *dev)
                         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);
+                                omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
                         }
 
                         return -EIO;
@@ -963,7 +963,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
                                 i2c_omap_errata_i207(dev, stat);
 
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_RDR);
-                        break;
+                        continue;
                 }
 
                 if (stat & OMAP_I2C_STAT_RRDY) {
@@ -989,7 +989,7 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
                                 break;
 
                         omap_i2c_ack_stat(dev, OMAP_I2C_STAT_XDR);
-                        break;
+                        continue;
                 }
 
                 if (stat & OMAP_I2C_STAT_XRDY) {