Skip to content

Commit

Permalink
power: axp288_charger: fix for API change
Browse files Browse the repository at this point in the history
Caused by commit 843735b ("power: axp288_charger: axp288 charger
driver") from the battery tree interacting with commit 046050f
("extcon: Update the prototype of extcon_register_notifier() with enum
extcon") from the extcon tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Stephen Rothwell authored and Linus Torvalds committed Jun 27, 2015
1 parent 93f0824 commit 4b703b1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/power/axp288_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for extcon notification */
INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
info->cable.nb.notifier_call = axp288_charger_handle_cable_evt;
ret = extcon_register_notifier(info->cable.edev, &info->cable.nb);
ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
if (ret) {
dev_err(&info->pdev->dev,
"failed to register extcon notifier %d\n", ret);
Expand Down Expand Up @@ -909,7 +909,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
extcon_unregister_interest(&info->otg.cable);
power_supply_unregister(info->psy_usb);
psy_reg_failed:
extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
return ret;
}

Expand All @@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
if (info->otg.cable.edev)
extcon_unregister_interest(&info->otg.cable);

extcon_unregister_notifier(info->cable.edev, &info->cable.nb);
extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb);
power_supply_unregister(info->psy_usb);

return 0;
Expand Down

0 comments on commit 4b703b1

Please sign in to comment.