summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-19 10:44:20 +0200
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-08-22 18:48:13 -0700
commitf77609959ade7378eed8b03df4c248f6d44c7e15 (patch)
tree8fd680604af27a463a04b5c72914de703f2040ef
parentd2941651d754fa04eebd0bba70d558424d838565 (diff)
downloadlinux-3.10-f77609959ade7378eed8b03df4c248f6d44c7e15.tar.gz
linux-3.10-f77609959ade7378eed8b03df4c248f6d44c7e15.tar.bz2
linux-3.10-f77609959ade7378eed8b03df4c248f6d44c7e15.zip
bq27x00_battery: Fix error return code
Initialize return variable before exiting on an error path. 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: Anton Vorontsov <anton.vorontsov@linaro.org>
-rw-r--r--drivers/power/bq27x00_battery.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 181ddece518..5860d4dfbe9 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -814,7 +814,8 @@ static int bq27x00_battery_probe(struct i2c_client *client,
di->bat.name = name;
di->bus.read = &bq27x00_read_i2c;
- if (bq27x00_powersupply_init(di))
+ retval = bq27x00_powersupply_init(di);
+ if (retval)
goto batt_failed_3;
i2c_set_clientdata(client, di);