Skip to content

Commit

Permalink
lp8727_charger: Unregister power supply at error path of lp8727_regis…
Browse files Browse the repository at this point in the history
…ter_psy

if usb power supply registration fails,
	we wont unregister the ac power supply
if battery power supply registration fails,
	we wont unregister the usb, and ac supply,

take care of those things and also no need of goto -err_mem: at the fail case of
kzalloc simply can have return -ENOMEM

Signed-off-by: Devendra Naga <develkernel412222@gmail.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
  • Loading branch information
Devendra Naga authored and Anton Vorontsov committed Aug 23, 2012
1 parent f776099 commit 6297b5e
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions drivers/power/lp8727_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)

psy = kzalloc(sizeof(*psy), GFP_KERNEL);
if (!psy)
goto err_mem;
return -ENOMEM;

pchg->psy = psy;

Expand All @@ -375,7 +375,7 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)
psy->ac.num_supplicants = ARRAY_SIZE(battery_supplied_to);

if (power_supply_register(pchg->dev, &psy->ac))
goto err_psy;
goto err_psy_ac;

psy->usb.name = "usb";
psy->usb.type = POWER_SUPPLY_TYPE_USB;
Expand All @@ -386,7 +386,7 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)
psy->usb.num_supplicants = ARRAY_SIZE(battery_supplied_to);

if (power_supply_register(pchg->dev, &psy->usb))
goto err_psy;
goto err_psy_usb;

psy->batt.name = "main_batt";
psy->batt.type = POWER_SUPPLY_TYPE_BATTERY;
Expand All @@ -396,13 +396,15 @@ static int lp8727_register_psy(struct lp8727_chg *pchg)
psy->batt.external_power_changed = lp8727_charger_changed;

if (power_supply_register(pchg->dev, &psy->batt))
goto err_psy;
goto err_psy_batt;

return 0;

err_mem:
return -ENOMEM;
err_psy:
err_psy_batt:
power_supply_unregister(&psy->usb);
err_psy_usb:
power_supply_unregister(&psy->ac);
err_psy_ac:
kfree(psy);
return -EPERM;
}
Expand Down

0 comments on commit 6297b5e

Please sign in to comment.