From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753379Ab2G2RrF (ORCPT ); Sun, 29 Jul 2012 13:47:05 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:53255 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753322Ab2G2RrC (ORCPT ); Sun, 29 Jul 2012 13:47:02 -0400 From: Devendra Naga To: Anton Vorontsov , David Woodhouse , linux-kernel@vger.kernel.org Cc: Devendra Naga Subject: [PATCH 2/2] lp8727_charger: unregister power supply at error path of lp8727_register_psy Date: Sun, 29 Jul 2012 23:31:55 +0545 Message-Id: <1343584015-30344-1-git-send-email-develkernel412222@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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