diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-25 07:00:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-26 20:44:09 -0400 |
commit | 4b703b1d4c46ca4a00109ca1a391943ec21991b3 (patch) | |
tree | d219cb12b036a291c68fc278452702b9c9219f3b | |
parent | 93f0824caec09b67fc4f927c8bddd7fabd14a043 (diff) |
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>
-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) | |||
848 | /* Register for extcon notification */ | 848 | /* Register for extcon notification */ |
849 | INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); | 849 | INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); |
850 | info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; | 850 | info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; |
851 | ret = extcon_register_notifier(info->cable.edev, &info->cable.nb); | 851 | ret = extcon_register_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb); |
852 | if (ret) { | 852 | if (ret) { |
853 | dev_err(&info->pdev->dev, | 853 | dev_err(&info->pdev->dev, |
854 | "failed to register extcon notifier %d\n", ret); | 854 | "failed to register extcon notifier %d\n", ret); |
@@ -909,7 +909,7 @@ intr_reg_failed: | |||
909 | extcon_unregister_interest(&info->otg.cable); | 909 | extcon_unregister_interest(&info->otg.cable); |
910 | power_supply_unregister(info->psy_usb); | 910 | power_supply_unregister(info->psy_usb); |
911 | psy_reg_failed: | 911 | psy_reg_failed: |
912 | extcon_unregister_notifier(info->cable.edev, &info->cable.nb); | 912 | extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb); |
913 | return ret; | 913 | return ret; |
914 | } | 914 | } |
915 | 915 | ||
@@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev) | |||
920 | if (info->otg.cable.edev) | 920 | if (info->otg.cable.edev) |
921 | extcon_unregister_interest(&info->otg.cable); | 921 | extcon_unregister_interest(&info->otg.cable); |
922 | 922 | ||
923 | extcon_unregister_notifier(info->cable.edev, &info->cable.nb); | 923 | extcon_unregister_notifier(info->cable.edev, EXTCON_NONE, &info->cable.nb); |
924 | power_supply_unregister(info->psy_usb); | 924 | power_supply_unregister(info->psy_usb); |
925 | 925 | ||
926 | return 0; | 926 | return 0; |