---

yaml --- r: 349062 b: refs/heads/master c: 2c5de55 h: refs/heads/master v: v3
git-mirror · Jan 22, 2013 · df3d299 · df3d299
1 parent f1a0ef2
commit df3d299
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;