From bab56d3c4468d5d09aa2da22830c4324a414ef21 Mon Sep 17 00:00:00 2001
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Sat, 22 Oct 2011 13:34:38 +0200
Subject: [PATCH] --- yaml --- r: 272460 b: refs/heads/master c:
 84785f120f4d64c5fa8cf4bab1cf07c2507d434f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bdce65a450b2..ba9b9221db2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85ea25698843d37b6f79927b2995644623fe1e06
+refs/heads/master: 84785f120f4d64c5fa8cf4bab1cf07c2507d434f
diff --git a/trunk/drivers/i2c/busses/i2c-au1550.c b/trunk/drivers/i2c/busses/i2c-au1550.c
index 98ee11aa9e2c..4f5150c417a2 100644
--- a/trunk/drivers/i2c/busses/i2c-au1550.c
+++ b/trunk/drivers/i2c/busses/i2c-au1550.c
@@ -101,7 +101,7 @@ static int wait_master_done(struct i2c_au1550_data *adap)
 	int i;
 
 	/* Wait for Master Done. */
-	for (i = 0; i < adap->xfer_timeout; i++) {
+	for (i = 0; i < 2 * adap->xfer_timeout; i++) {
 		if ((RD(adap, PSC_SMBEVNT) & PSC_SMBEVNT_MD) != 0)
 			return 0;
 		udelay(1);