---

yaml --- r: 156979 b: refs/heads/master c: dd11976 h: refs/heads/master i: 156977: 81f1065 156975: 3e08931 v: v3
git-mirror · Aug 20, 2009 · 7aacfbe · 7aacfbe
1 parent 5092f6c
commit 7aacfbe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc4ec26942d3bae2c5a82ab8346ab53b540a171
+refs/heads/master: dd11976aea15bde53ce40b076dd5fa462c74f41a
diff --git a/trunk/drivers/i2c/busses/i2c-omap.c b/trunk/drivers/i2c/busses/i2c-omap.c
@@ -694,6 +694,9 @@ omap_i2c_isr(int this_irq, void *dev_id)
 		}
 		if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK |
 					OMAP_I2C_STAT_AL)) {
+			omap_i2c_ack_stat(dev, stat &
+				(OMAP_I2C_STAT_RRDY | OMAP_I2C_STAT_RDR |
+				OMAP_I2C_STAT_XRDY | OMAP_I2C_STAT_XDR));
 			omap_i2c_complete_cmd(dev, err);
 			return IRQ_HANDLED;
 		}