52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
|
--- a/drivers/usb/host/ohci-hcd.c
|
||
|
|
+++ b/drivers/usb/host/ohci-hcd.c
|
||
|
|
@@ -1117,7 +1117,7 @@ MODULE_LICENSE ("GPL");
|
||
|
|
|
||
|
|
#ifdef CONFIG_USB_OHCI_HCD_PLATFORM
|
||
|
|
#include "ohci-platform.c"
|
||
|
|
-#define PLATFORM_DRIVER ohci_platform_driver
|
||
|
|
+#define OHCI_PLATFORM_DRIVER ohci_platform_driver
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#if !defined(PCI_DRIVER) && \
|
||
|
|
@@ -1128,7 +1128,8 @@ MODULE_LICENSE ("GPL");
|
||
|
|
!defined(SA1111_DRIVER) && \
|
||
|
|
!defined(PS3_SYSTEM_BUS_DRIVER) && \
|
||
|
|
!defined(SM501_OHCI_DRIVER) && \
|
||
|
|
- !defined(TMIO_OHCI_DRIVER)
|
||
|
|
+ !defined(TMIO_OHCI_DRIVER) && \
|
||
|
|
+ !defined(OHCI_PLATFORM_DRIVER)
|
||
|
|
#error "missing bus glue for ohci-hcd"
|
||
|
|
#endif
|
||
|
|
|
||
|
|
@@ -1206,9 +1207,19 @@ static int __init ohci_hcd_mod_init(void
|
||
|
|
goto error_tmio;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#ifdef OHCI_PLATFORM_DRIVER
|
||
|
|
+ retval = platform_driver_register(&OHCI_PLATFORM_DRIVER);
|
||
|
|
+ if (retval < 0)
|
||
|
|
+ goto error_ohci;
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
return retval;
|
||
|
|
|
||
|
|
/* Error path */
|
||
|
|
+#ifdef OHCI_PLATFORM_DRIVER
|
||
|
|
+ platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
|
||
|
|
+ error_ohci:
|
||
|
|
+#endif
|
||
|
|
#ifdef TMIO_OHCI_DRIVER
|
||
|
|
platform_driver_unregister(&TMIO_OHCI_DRIVER);
|
||
|
|
error_tmio:
|
||
|
|
@@ -1258,6 +1269,9 @@ module_init(ohci_hcd_mod_init);
|
||
|
|
|
||
|
|
static void __exit ohci_hcd_mod_exit(void)
|
||
|
|
{
|
||
|
|
+#ifdef OHCI_PLATFORM_DRIVER
|
||
|
|
+ platform_driver_unregister(&OHCI_PLATFORM_DRIVER);
|
||
|
|
+#endif
|
||
|
|
#ifdef TMIO_OHCI_DRIVER
|
||
|
|
platform_driver_unregister(&TMIO_OHCI_DRIVER);
|
||
|
|
#endif
|