From b068e01c9194d1f573e7dc22fada303761cd82dd Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 14 Feb 2013 09:22:48 +0000 Subject: [PATCH] --- yaml --- r: 367459 b: refs/heads/master c: 72a90ddbc3d89a63b769ae1b8538c612cf01e675 h: refs/heads/master i: 367457: ff22fd7d2b4ae937e8e42481d2fea4b6ed51e9b3 367455: ad732e7e434bb49d9fc43f1c989308ebe8144b72 v: v3 --- [refs] | 2 +- trunk/drivers/power/ab8500_charger.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2c3566197a59..08d780d166a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f4aa401853e07885707aedfc68c608051b0d6e4 +refs/heads/master: 72a90ddbc3d89a63b769ae1b8538c612cf01e675 diff --git a/trunk/drivers/power/ab8500_charger.c b/trunk/drivers/power/ab8500_charger.c index fd3fa2beca2b..dcd3c6feca97 100644 --- a/trunk/drivers/power/ab8500_charger.c +++ b/trunk/drivers/power/ab8500_charger.c @@ -3152,10 +3152,10 @@ static int ab8500_charger_remove(struct platform_device *pdev) destroy_workqueue(di->charger_wq); flush_scheduled_work(); - if(di->usb_chg.enabled) + if (di->usb_chg.enabled) power_supply_unregister(&di->usb_chg.psy); #if !defined(CONFIG_CHARGER_PM2301) - if(di->ac_chg.enabled) + if (di->ac_chg.enabled) power_supply_unregister(&di->ac_chg.psy); #endif platform_set_drvdata(pdev, NULL); @@ -3331,7 +3331,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) } /* Register AC charger class */ - if(di->ac_chg.enabled) { + if (di->ac_chg.enabled) { ret = power_supply_register(di->dev, &di->ac_chg.psy); if (ret) { dev_err(di->dev, "failed to register AC charger\n"); @@ -3340,7 +3340,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) } /* Register USB charger class */ - if(di->usb_chg.enabled) { + if (di->usb_chg.enabled) { ret = power_supply_register(di->dev, &di->usb_chg.psy); if (ret) { dev_err(di->dev, "failed to register USB charger\n"); @@ -3425,10 +3425,10 @@ static int ab8500_charger_probe(struct platform_device *pdev) put_usb_phy: usb_put_phy(di->usb_phy); free_usb: - if(di->usb_chg.enabled) + if (di->usb_chg.enabled) power_supply_unregister(&di->usb_chg.psy); free_ac: - if(di->ac_chg.enabled) + if (di->ac_chg.enabled) power_supply_unregister(&di->ac_chg.psy); free_charger_wq: destroy_workqueue(di->charger_wq);