summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2013-01-17 10:45:55 +0100
committerWolfram Sang <wolfram@the-dreams.de>2013-02-10 19:55:23 +0100
commit5687265b3127024089dc0b25956772405b9f53d3 (patch)
tree1b88a79fedd263c782dbccb6a1fcc52691465088 /drivers/i2c
parenti2c: sh_mobile: cosmetic: trivially simplify 2 functions (diff)
downloadlinux-5687265b3127024089dc0b25956772405b9f53d3.tar.xz
linux-5687265b3127024089dc0b25956772405b9f53d3.zip
i2c: sh_mobile: fix timeout error handling
In a timeout case return an error immediately from the driver's .master_xfer() method, instead of continuing and letting higher layers fail. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Wolfram Sang <wolfram@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-sh_mobile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 34024f3a19f5..daaf0ebe8177 100644
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/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: