Title: [7741] trunk/drivers/i2c/busses/i2c-bfin-twi.c: In i2c err interrupt, return completion if this is a smbus quick transfer.
Revision
7741
Author
sonicz
Date
2009-11-02 04:12:20 -0500 (Mon, 02 Nov 2009)

Log Message

In i2c err interrupt, return completion if this is a smbus quick transfer.

smbus quick transfer has no data after address byte.

Modified Paths

Diff

Modified: trunk/drivers/i2c/busses/i2c-bfin-twi.c (7740 => 7741)


--- trunk/drivers/i2c/busses/i2c-bfin-twi.c	2009-11-02 07:29:07 UTC (rev 7740)
+++ trunk/drivers/i2c/busses/i2c-bfin-twi.c	2009-11-02 09:12:20 UTC (rev 7741)
@@ -158,18 +158,13 @@
 		if (mast_stat & BUFWRERR)
 			dev_dbg(&iface->adap.dev, "Buffer Write Error\n");
 
-		/* if both err and complete int stats are set, return proper
-		 * results.
+		/* If it is a quick transfer, only address without data,
+		 * not an err, return 1.
 		 */
-		if (twi_int_status & MCOMP) {
-			/* If it is a quick transfer, only address without data,
-			 * not an err, return 1.
-			 * If address is acknowledged return 1.
-			 */
-			if ((iface->writeNum == 0 && (mast_stat & BUFRDERR))
-				|| !(mast_stat & ANAK))
-				iface->result = 1;
-		}
+		if (iface->cur_mode == TWI_I2C_MODE_STANDARD &&
+			iface->transPtr == NULL)
+			iface->result = 1;
+
 		complete(&iface->complete);
 		return;
 	}
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits

Reply via email to