projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c64eb2
)
i2c-octeon: Return -ETIMEDOUT in octeon_i2c_wait() on timeout
author
Bernhard Walle
<
[email protected]
>
Mon, 27 Sep 2010 10:55:16 +0000
(12:55 +0200)
committer
Ben Dooks
<
[email protected]
>
Mon, 27 Sep 2010 22:21:16 +0000
(23:21 +0100)
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 <
[email protected]
>
Acked-by: David Daney <
[email protected]
>
Signed-off-by: Ben Dooks <
[email protected]
>
drivers/i2c/busses/i2c-octeon.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-octeon.c
b/drivers/i2c/busses/i2c-octeon.c
index 0e9f85d0a835718dac97ecd52ff270f327d84136..56dbe54e88118a3fb7b112da16e11ccd5bdbc9fb 100644
(file)
--- 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__);
- re
sult =
-ETIMEDOUT;
+ re
turn
-ETIMEDOUT;
}
return 0;