summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2014-08-06 22:12:15 +0200
committerLee Jones <lee.jones@linaro.org>2014-09-26 09:15:37 +0200
commitf2b86781619c0822b4e0b561ef9aa499b5ed76ff (patch)
tree262359072ba9734c06776b559dcd80a1b6052e60 /drivers/mfd
parentmfd: wm8994: Allow modular build (diff)
downloadlinux-f2b86781619c0822b4e0b561ef9aa499b5ed76ff.tar.xz
linux-f2b86781619c0822b4e0b561ef9aa499b5ed76ff.zip
mfd: twl6040: Fix error return code
Convert a zero return value on error to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/twl6040.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index f9c06c542a41..9687645162ae 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -679,6 +679,7 @@ static int twl6040_probe(struct i2c_client *client,
if (twl6040->rev < 0) {
dev_err(&client->dev, "Failed to read revision register: %d\n",
twl6040->rev);
+ ret = twl6040->rev;
goto gpio_err;
}