---

yaml --- r: 319177 b: refs/heads/master c: 2ee74eb h: refs/heads/master i: 319175: fdc521c v: v3
git-mirror · Jul 13, 2012 · 73fb277 · 73fb277
1 parent 4cb5c51
commit 73fb277
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a25733d6f6968240042ac94dc93c7ae3c9e8d68b
+refs/heads/master: 2ee74eb95cf36b1a69e483f9ba2191bd8022b2c1
diff --git a/trunk/drivers/i2c/busses/i2c-bfin-twi.c b/trunk/drivers/i2c/busses/i2c-bfin-twi.c
@@ -201,7 +201,8 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface,
 		return;
 	}
 	if (twi_int_status & MCOMP) {
-		if ((read_MASTER_CTL(iface) & MEN) == 0 &&
+		if (twi_int_status & (XMTSERV | RCVSERV) &&
+			(read_MASTER_CTL(iface) & MEN) == 0 &&
 			(iface->cur_mode == TWI_I2C_MODE_REPEAT ||
 			iface->cur_mode == TWI_I2C_MODE_COMBINED)) {
 			iface->result = -1;