summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-19 10:44:18 +0200
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-08-22 18:47:40 -0700
commit588d4f0b05c9bb09c2474460be78f41813b2d861 (patch)
tree2e828fc001ea02d70e8bc0ed36891b411ead84b4
parentfc2bc0c29a4e32da13ab75101edde030a6362d10 (diff)
downloadlinux-3.10-588d4f0b05c9bb09c2474460be78f41813b2d861.tar.gz
linux-3.10-588d4f0b05c9bb09c2474460be78f41813b2d861.tar.bz2
linux-3.10-588d4f0b05c9bb09c2474460be78f41813b2d861.zip
wm97xx_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/wm97xx_battery.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index d2d4c08c681..0ba331a06dc 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -212,8 +212,10 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
props++; /* POWER_SUPPLY_PROP_VOLTAGE_MIN */
prop = kzalloc(props * sizeof(*prop), GFP_KERNEL);
- if (!prop)
+ if (!prop) {
+ ret = -ENOMEM;
goto err3;
+ }
prop[i++] = POWER_SUPPLY_PROP_PRESENT;
if (pdata->charge_gpio >= 0)