Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 367459
b: refs/heads/master
c: 72a90dd
h: refs/heads/master
i:
  367457: ff22fd7
  367455: ad732e7
v: v3
  • Loading branch information
Lee Jones committed Mar 7, 2013
1 parent 1c56d0c commit b068e01
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0f4aa401853e07885707aedfc68c608051b0d6e4
refs/heads/master: 72a90ddbc3d89a63b769ae1b8538c612cf01e675
12 changes: 6 additions & 6 deletions trunk/drivers/power/ab8500_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand All @@ -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");
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit b068e01

Please sign in to comment.