From 277d9e7c1b8898bd5309c56f5f987382f42f8592 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Thu, 30 Aug 2012 12:40:04 +0200
Subject: [PATCH] --- yaml --- r: 333399 b: refs/heads/master c:
 0c25aefa35c2fb5592895615f77d9f6fa36a849d h: refs/heads/master i:   333397:
 83903af3492191f4585fe8602154fb3a0fd259cd   333395:
 996534df43825711229ad44946c1db7627579dfa   333391:
 9abd38ea96868230e8a5462b5ed997d1cb150027 v: v3

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

diff --git a/[refs] b/[refs]
index 2476af3fe729..7dbe18e67b3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bdbfa9c4a14f0015d1e189b17175a989d7c2a40
+refs/heads/master: 0c25aefa35c2fb5592895615f77d9f6fa36a849d
diff --git a/trunk/drivers/i2c/busses/i2c-mpc.c b/trunk/drivers/i2c/busses/i2c-mpc.c
index b76731edbf10..64b0b4d265d5 100644
--- a/trunk/drivers/i2c/busses/i2c-mpc.c
+++ b/trunk/drivers/i2c/busses/i2c-mpc.c
@@ -576,7 +576,23 @@ static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 			    mpc_write(i2c, pmsg->addr, pmsg->buf, pmsg->len, i);
 		}
 	}
-	mpc_i2c_stop(i2c);
+	mpc_i2c_stop(i2c); /* Initiate STOP */
+	orig_jiffies = jiffies;
+	/* Wait until STOP is seen, allow up to 1 s */
+	while (readb(i2c->base + MPC_I2C_SR) & CSR_MBB) {
+		if (time_after(jiffies, orig_jiffies + HZ)) {
+			u8 status = readb(i2c->base + MPC_I2C_SR);
+
+			dev_dbg(i2c->dev, "timeout\n");
+			if ((status & (CSR_MCF | CSR_MBB | CSR_RXAK)) != 0) {
+				writeb(status & ~CSR_MAL,
+				       i2c->base + MPC_I2C_SR);
+				mpc_i2c_fixup(i2c);
+			}
+			return -EIO;
+		}
+		cond_resched();
+	}
 	return (ret < 0) ? ret : num;
 }