* [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy @ 2012-07-29 17:46 Devendra Naga 2012-07-30 4:47 ` Pallala, Ramakrishna 0 siblings, 1 reply; 4+ messages in thread From: Devendra Naga @ 2012-07-29 17:46 UTC (permalink / raw) To: Anton Vorontsov, David Woodhouse, linux-kernel; +Cc: Devendra Naga 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> --- drivers/power/lp8727_charger.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 699f0ef..401b66e 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -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; @@ -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_ac; psy->batt.name = "main_batt"; psy->batt.type = POWER_SUPPLY_TYPE_BATTERY; @@ -396,12 +396,14 @@ 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_usb; return 0; -err_mem: - return -ENOMEM; +err_psy_usb: + power_supply_unregister(&psy->usb); +err_psy_ac: + power_supply_unregister(&psy->ac); err_psy: kfree(psy); return -EPERM; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy 2012-07-29 17:46 [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy Devendra Naga @ 2012-07-30 4:47 ` Pallala, Ramakrishna 2012-08-23 2:18 ` Anton Vorontsov 0 siblings, 1 reply; 4+ messages in thread From: Pallala, Ramakrishna @ 2012-07-30 4:47 UTC (permalink / raw) To: Devendra Naga Cc: Anton Vorontsov, David Woodhouse, linux-kernel@vger.kernel.org > if (power_supply_register(pchg->dev, &psy->usb)) > - goto err_psy; > + goto err_psy_ac; "err_psy_ac" label name is confusing. Why can't you use err_psy_usb > if (power_supply_register(pchg->dev, &psy->batt)) > - goto err_psy; > + goto err_psy_usb; Same here, why don't you use err_psy_batt Thanks, Ram ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy 2012-07-30 4:47 ` Pallala, Ramakrishna @ 2012-08-23 2:18 ` Anton Vorontsov 2012-08-23 16:50 ` Devendra Naga 0 siblings, 1 reply; 4+ messages in thread From: Anton Vorontsov @ 2012-08-23 2:18 UTC (permalink / raw) To: Pallala, Ramakrishna Cc: Devendra Naga, David Woodhouse, linux-kernel@vger.kernel.org On Mon, Jul 30, 2012 at 04:47:44AM +0000, Pallala, Ramakrishna wrote: > > if (power_supply_register(pchg->dev, &psy->usb)) > > - goto err_psy; > > + goto err_psy_ac; > > "err_psy_ac" label name is confusing. Why can't you use err_psy_usb > > > if (power_supply_register(pchg->dev, &psy->batt)) > > - goto err_psy; > > + goto err_psy_usb; > > Same here, why don't you use err_psy_batt Thanks, folks! It was easy to change so I applied the following: commit 6297b5e54b5511d4e72e8d5fc3b139650adc74d8 Author: Devendra Naga <develkernel412222@gmail.com> Date: Sun Jul 29 23:31:55 2012 +0545 lp8727_charger: Unregister power supply at error path of lp8727_register_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> diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 6a364f4..4e37b26 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -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; @@ -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; @@ -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; @@ -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; } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy 2012-08-23 2:18 ` Anton Vorontsov @ 2012-08-23 16:50 ` Devendra Naga 0 siblings, 0 replies; 4+ messages in thread From: Devendra Naga @ 2012-08-23 16:50 UTC (permalink / raw) To: Anton Vorontsov Cc: Pallala, Ramakrishna, David Woodhouse, linux-kernel@vger.kernel.org Hi Anton, Thanks for merging this in. Actually a V2 has been sent a long ago after receving comments for Ramakrishna, that actually does the same changes as you have currently done. Anyways Thanks again. On Thu, Aug 23, 2012 at 7:48 AM, Anton Vorontsov <anton.vorontsov@linaro.org> wrote: > On Mon, Jul 30, 2012 at 04:47:44AM +0000, Pallala, Ramakrishna wrote: >> > if (power_supply_register(pchg->dev, &psy->usb)) >> > - goto err_psy; >> > + goto err_psy_ac; >> >> "err_psy_ac" label name is confusing. Why can't you use err_psy_usb >> >> > if (power_supply_register(pchg->dev, &psy->batt)) >> > - goto err_psy; >> > + goto err_psy_usb; >> >> Same here, why don't you use err_psy_batt > > Thanks, folks! It was easy to change so I applied the following: > > commit 6297b5e54b5511d4e72e8d5fc3b139650adc74d8 > Author: Devendra Naga <develkernel412222@gmail.com> > Date: Sun Jul 29 23:31:55 2012 +0545 > > lp8727_charger: Unregister power supply at error path of lp8727_register_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> > > diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c > index 6a364f4..4e37b26 100644 > --- a/drivers/power/lp8727_charger.c > +++ b/drivers/power/lp8727_charger.c > @@ -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; > > @@ -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; > @@ -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; > @@ -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; > } ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-23 16:50 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-29 17:46 [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy Devendra Naga 2012-07-30 4:47 ` Pallala, Ramakrishna 2012-08-23 2:18 ` Anton Vorontsov 2012-08-23 16:50 ` Devendra Naga
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox