aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBernhard Walle <walle@corscience.de>2010-09-27 12:55:16 +0200
committerBen Dooks <ben-linux@fluff.org>2010-09-27 23:21:16 +0100
commitcc33e54290ed845904dac4b047934207738f0205 (patch)
tree439d14aca85918a9aef8c371513c249d331771ac /drivers
parent5c64eb26ed5c5550fbabd345e573af3fc6a7f775 (diff)
downloadmrst-s0i3-test-cc33e54290ed845904dac4b047934207738f0205.tar.gz
mrst-s0i3-test-cc33e54290ed845904dac4b047934207738f0205.tar.xz
mrst-s0i3-test-cc33e54290ed845904dac4b047934207738f0205.zip
i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
It doesn't make sense to set result to -ETIMEDOUT but return 0 (success) afterwards. Since there's code in octeon_i2c_start() to handle the error, it should be called. Signed-off-by: Bernhard Walle <walle@corscience.de> Acked-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-octeon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 0e9f85d0a83..56dbe54e881 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -218,7 +218,7 @@ static int octeon_i2c_wait(struct octeon_i2c *i2c)
return result;
} else if (result == 0) {
dev_dbg(i2c->dev, "%s: timeout\n", __func__);
- result = -ETIMEDOUT;
+ return -ETIMEDOUT;
}
return 0;