USB: RK3288 USB CTLR initialization

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-hcd.c

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index a17d73217e6547906c30fa012263b63c8735b9c0..16068290a74f4a221cff76d0d9cc59803cb8705a 100644 (file)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1268,7 +1268,7 @@ MODULE_LICENSE ("GPL");
 
 #ifdef CONFIG_USB_EHCI_RKHSIC
 #include "ehci-rkhsic.c"
-#define PLATFORM_DRIVER         ehci_rkhsic_driver
+#define RK_PLATFORM_DRIVER         ehci_rkhsic_driver
 #endif
 
 #ifdef CONFIG_USB_EHCI_HCD_PMC_MSP
@@ -1346,8 +1346,19 @@ static int __init ehci_hcd_init(void)
        if (retval < 0)
                goto clean4;
 #endif
+
+#ifdef RK_PLATFORM_DRIVER
+       retval = platform_driver_register(&RK_PLATFORM_DRIVER);
+       if (retval < 0)
+               goto clean5;
+#endif
        return retval;
 
+#ifdef RK_PLATFORM_DRIVER
+       platform_driver_unregister(&RK_PLATFORM_DRIVER);
+clean5:
+#endif
+
 #ifdef XILINX_OF_PLATFORM_DRIVER
        /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
 clean4:
@@ -1376,6 +1387,9 @@ module_init(ehci_hcd_init);
 
 static void __exit ehci_hcd_cleanup(void)
 {
+#ifdef RK_PLATFORM_DRIVER
+       platform_driver_unregister(&RK_PLATFORM_DRIVER);
+#endif
 #ifdef XILINX_OF_PLATFORM_DRIVER
        platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
 #endif