From 5c80f83d0ab9cf0e0061c79c4290cac9a257ad2c Mon Sep 17 00:00:00 2001 From: lyz Date: Wed, 24 Jun 2015 11:15:33 +0800 Subject: [PATCH] usb: bc: fix compile error Fix conflicting types for 'rk_bc_detect_notifier_register' --- drivers/usb/dwc_otg_310/usbdev_bc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc_otg_310/usbdev_bc.c b/drivers/usb/dwc_otg_310/usbdev_bc.c index 612672fba515..79a08a0a44f9 100755 --- a/drivers/usb/dwc_otg_310/usbdev_bc.c +++ b/drivers/usb/dwc_otg_310/usbdev_bc.c @@ -426,7 +426,7 @@ EXPORT_SYMBOL(dwc_otg_check_dpdm); static ATOMIC_NOTIFIER_HEAD(rk_bc_notifier); int rk_bc_detect_notifier_register(struct notifier_block *nb, - int *type) + enum bc_port_type *type) { *type = (int)usb_battery_charger_detect(0); return atomic_notifier_chain_register(&rk_bc_notifier, nb); -- 2.34.1