From 5fd3b24dd75515c31262719535b2243fa6f1167d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 17 Jan 2013 10:45:55 +0100
Subject: [PATCH] --- yaml --- r: 358794 b: refs/heads/master c:
 5687265b3127024089dc0b25956772405b9f53d3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0cf343b1a286..fc2406fc3991 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05cf936846ca6aef1b34ba26054728fdbc154558
+refs/heads/master: 5687265b3127024089dc0b25956772405b9f53d3
diff --git a/trunk/drivers/i2c/busses/i2c-sh_mobile.c b/trunk/drivers/i2c/busses/i2c-sh_mobile.c
index 34024f3a19f5..daaf0ebe8177 100644
--- a/trunk/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/trunk/drivers/i2c/busses/i2c-sh_mobile.c
@@ -521,8 +521,11 @@ static int sh_mobile_i2c_xfer(struct i2c_adapter *adapter,
 		k = wait_event_timeout(pd->wait,
 				       pd->sr & (ICSR_TACK | SW_DONE),
 				       5 * HZ);
-		if (!k)
+		if (!k) {
 			dev_err(pd->dev, "Transfer request timed out\n");
+			err = -ETIMEDOUT;
+			break;
+		}
 
 		retry_count = 1000;
 again: