bq27x00_battery: Fix error return code
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sun, 19 Aug 2012 08:44:20 +0000 (10:44 +0200)
committerAnton Vorontsov <anton.vorontsov@linaro.org>
Thu, 23 Aug 2012 01:48:13 +0000 (18:48 -0700)
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>
drivers/power/bq27x00_battery.c

index 181ddece5181afceb5d025fbdcf9bfb7f641f007..5860d4dfbe9cdaf3fbeed4870429c5e918166c3c 100644 (file)
@@ -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);