diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-25 14:00:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-27 03:44:09 +0300 |
| commit | 4b703b1d4c46ca4a00109ca1a391943ec21991b3 (patch) | |
| tree | d219cb12b036a291c68fc278452702b9c9219f3b /drivers/power | |
| parent | 93f0824caec09b67fc4f927c8bddd7fabd14a043 (diff) | |
| download | linux-4b703b1d4c46ca4a00109ca1a391943ec21991b3.tar.xz | |
power: axp288_charger: fix for API change
Caused by commit 843735b788a4 ("power: axp288_charger: axp288 charger
driver") from the battery tree interacting with commit 046050f6e623
("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>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/axp288_charger.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/axp288_charger.c b/drivers/power/axp288_charger.c index 5680317f4823..e4d569f57acc 100644 --- a/drivers/power/axp288_charger.c +++ b/drivers/power/axp288_charger.c @@ -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); @@ -909,7 +909,7 @@ intr_reg_failed: 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; } @@ -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; |