projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 49b662b)
drivers: usb: silence enum-conversion warnings
authorMichael Benedict <michaelbt@live.com>
Mon, 3 Jun 2019 11:32:16 +0000 (21:32 +1000)
committerivanmeler <i_ivan@windowslive.com>
Wed, 13 Apr 2022 21:13:37 +0000 (21:13 +0000)
Signed-off-by: Michael Benedict <michaelbt@live.com>
drivers/usb/dwc3/core.c patch | blob | blame | history
drivers/usb/notify/usb_notifier.c patch | blob | blame | history

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 9a1c441da4dc9b735ffac9f5794c5c8c32dfdbb0..87f3d0729e2b5990cb42ae01c1f9a37118821809 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -61,7 +61,7 @@ int dwc3_set_vbus_current(int state)
        }
 
        pval.intval = state; 
-       power_supply_set_property(psy, POWER_SUPPLY_EXT_PROP_USB_CONFIGURE, &pval);
+       psy_do_property("battery", set, POWER_SUPPLY_EXT_PROP_USB_CONFIGURE, pval);
        power_supply_put(psy);
        return 0;
 }
diff --git a/drivers/usb/notify/usb_notifier.c b/drivers/usb/notify/usb_notifier.c
index 686005cac878d9481db351195fee4ee5b101b1e1..8b2cdc0f0588f94819e90f9a5fad72a3c404ffaf 100755 (executable)
--- a/drivers/usb/notify/usb_notifier.c
+++ b/drivers/usb/notify/usb_notifier.c
@@ -726,7 +726,7 @@ static int usb_notifier_probe(struct platform_device *pdev)
 #endif
 #if defined(CONFIG_VBUS_NOTIFIER)
        vbus_notifier_register(&pdata->vbus_nb, vbus_handle_notification,
-                              MUIC_NOTIFY_DEV_USB);
+                              VBUS_NOTIFY_DEV_USB);
 #endif
        dev_info(&pdev->dev, "usb notifier probe\n");
        return 0;