From 73fb2778d11cc9cda3c33076f0c1d671f5ead0c2 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Wed, 13 Jun 2012 16:22:43 +0800
Subject: [PATCH] --- yaml --- r: 319177 b: refs/heads/master c:
 2ee74eb95cf36b1a69e483f9ba2191bd8022b2c1 h: refs/heads/master i:   319175:
 fdc521c03cc7b8053006697f2a2430015a428fc9 v: v3

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

diff --git a/[refs] b/[refs]
index 1ccc693f8726..97dee536dcbd 100644
--- 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
index 5fb5f3ee13a2..71be486a224d 100644
--- 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;