Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 07:10:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

power: axp288_charger: fix for API change

Browse Source 
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>
This commit is contained in:
Stephen Rothwell 2015-05-25 21:00:24 +10:00 committed by Linus Torvalds
parent 93f0824cae
commit 4b703b1d4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/power/axp288_charger.c
View File

@ -848,7 +848,7 @@ static int axp288_charger_probe(struct platform_device *pdev)
/* Register for extcon notification */ /* Register for extcon notification */
INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker); INIT_WORK(&info->cable.work, axp288_charger_extcon_evt_worker);
info->cable.nb.notifier_call = axp288_charger_handle_cable_evt; 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) { if (ret) {
dev_err(&info->pdev->dev, dev_err(&info->pdev->dev,
"failed to register extcon notifier %d\n", ret); "failed to register extcon notifier %d\n", ret);
@ -909,7 +909,7 @@ intr_reg_failed:
extcon_unregister_interest(&info->otg.cable); extcon_unregister_interest(&info->otg.cable);
power_supply_unregister(info->psy_usb); power_supply_unregister(info->psy_usb);
psy_reg_failed: 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; return ret;
} }
@ -920,7 +920,7 @@ static int axp288_charger_remove(struct platform_device *pdev)
if (info->otg.cable.edev) if (info->otg.cable.edev)
extcon_unregister_interest(&info->otg.cable); 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); power_supply_unregister(info->psy_usb);
return 0; return 0;