blob: a2a213b381a2fef1f8b78f71f4cdc3e738490280 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1123,7 +1123,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) && \
@@ -1135,7 +1135,8 @@ MODULE_LICENSE ("GPL");
!defined(PS3_SYSTEM_BUS_DRIVER) && \
!defined(SM501_OHCI_DRIVER) && \
!defined(TMIO_OHCI_DRIVER) && \
- !defined(SSB_OHCI_DRIVER)
+ !defined(SSB_OHCI_DRIVER) && \
+ !defined(OHCI_PLATFORM_DRIVER)
#error "missing bus glue for ohci-hcd"
#endif
@@ -1219,9 +1220,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:
@@ -1275,6 +1286,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
|
