---

yaml --- r: 358794 b: refs/heads/master c: 5687265 h: refs/heads/master v: v3
git-mirror · Feb 10, 2013 · 5fd3b24 · 5fd3b24
1 parent f01b844
commit 5fd3b24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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: