From df3d2991cb1662b88be790ca3ba566aff5210bb8 Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sun, 20 Jan 2013 02:32:58 +0200
Subject: [PATCH] --- yaml --- r: 349062 b: refs/heads/master c:
 2c5de558cd228e6d9ae633fb318f18942c7248f1 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/i2c/busses/i2c-omap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bb4fb926e7f7..b4b44df94c00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a2bd42d077de6ad40b00a2abfc4677e24d239c
+refs/heads/master: 2c5de558cd228e6d9ae633fb318f18942c7248f1
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
index 20d41bfa7c19..832f16e19f44 100644
--- a/trunk/drivers/i2c/busses/i2c-omap.c
+++ b/trunk/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;