diff options
-rw-r--r-- | drivers/power/ab8500_charger.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index fd3fa2beca2b..dcd3c6feca97 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c | |||
@@ -3152,10 +3152,10 @@ static int ab8500_charger_remove(struct platform_device *pdev) | |||
3152 | destroy_workqueue(di->charger_wq); | 3152 | destroy_workqueue(di->charger_wq); |
3153 | 3153 | ||
3154 | flush_scheduled_work(); | 3154 | flush_scheduled_work(); |
3155 | if(di->usb_chg.enabled) | 3155 | if (di->usb_chg.enabled) |
3156 | power_supply_unregister(&di->usb_chg.psy); | 3156 | power_supply_unregister(&di->usb_chg.psy); |
3157 | #if !defined(CONFIG_CHARGER_PM2301) | 3157 | #if !defined(CONFIG_CHARGER_PM2301) |
3158 | if(di->ac_chg.enabled) | 3158 | if (di->ac_chg.enabled) |
3159 | power_supply_unregister(&di->ac_chg.psy); | 3159 | power_supply_unregister(&di->ac_chg.psy); |
3160 | #endif | 3160 | #endif |
3161 | platform_set_drvdata(pdev, NULL); | 3161 | platform_set_drvdata(pdev, NULL); |
@@ -3331,7 +3331,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) | |||
3331 | } | 3331 | } |
3332 | 3332 | ||
3333 | /* Register AC charger class */ | 3333 | /* Register AC charger class */ |
3334 | if(di->ac_chg.enabled) { | 3334 | if (di->ac_chg.enabled) { |
3335 | ret = power_supply_register(di->dev, &di->ac_chg.psy); | 3335 | ret = power_supply_register(di->dev, &di->ac_chg.psy); |
3336 | if (ret) { | 3336 | if (ret) { |
3337 | dev_err(di->dev, "failed to register AC charger\n"); | 3337 | dev_err(di->dev, "failed to register AC charger\n"); |
@@ -3340,7 +3340,7 @@ static int ab8500_charger_probe(struct platform_device *pdev) | |||
3340 | } | 3340 | } |
3341 | 3341 | ||
3342 | /* Register USB charger class */ | 3342 | /* Register USB charger class */ |
3343 | if(di->usb_chg.enabled) { | 3343 | if (di->usb_chg.enabled) { |
3344 | ret = power_supply_register(di->dev, &di->usb_chg.psy); | 3344 | ret = power_supply_register(di->dev, &di->usb_chg.psy); |
3345 | if (ret) { | 3345 | if (ret) { |
3346 | dev_err(di->dev, "failed to register USB charger\n"); | 3346 | dev_err(di->dev, "failed to register USB charger\n"); |
@@ -3425,10 +3425,10 @@ free_irq: | |||
3425 | put_usb_phy: | 3425 | put_usb_phy: |
3426 | usb_put_phy(di->usb_phy); | 3426 | usb_put_phy(di->usb_phy); |
3427 | free_usb: | 3427 | free_usb: |
3428 | if(di->usb_chg.enabled) | 3428 | if (di->usb_chg.enabled) |
3429 | power_supply_unregister(&di->usb_chg.psy); | 3429 | power_supply_unregister(&di->usb_chg.psy); |
3430 | free_ac: | 3430 | free_ac: |
3431 | if(di->ac_chg.enabled) | 3431 | if (di->ac_chg.enabled) |
3432 | power_supply_unregister(&di->ac_chg.psy); | 3432 | power_supply_unregister(&di->ac_chg.psy); |
3433 | free_charger_wq: | 3433 | free_charger_wq: |
3434 | destroy_workqueue(di->charger_wq); | 3434 | destroy_workqueue(di->charger_wq); |