| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 |
- --- a/drivers/usb/host/ehci-hcd.c
- +++ b/drivers/usb/host/ehci-hcd.c
- @@ -1383,12 +1383,12 @@ MODULE_LICENSE ("GPL");
-
- #ifdef CONFIG_USB_EHCI_HCD_PLATFORM
- #include "ehci-platform.c"
- -#define PLATFORM_DRIVER ehci_platform_driver
- +#define EHCI_PLATFORM_DRIVER ehci_platform_driver
- #endif
-
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
- !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
- - !defined(XILINX_OF_PLATFORM_DRIVER)
- + !defined(XILINX_OF_PLATFORM_DRIVER) && !defined(EHCI_PLATFORM_DRIVER)
- #error "missing bus glue for ehci-hcd"
- #endif
-
- @@ -1448,8 +1448,19 @@ static int __init ehci_hcd_init(void)
- if (retval < 0)
- goto clean4;
- #endif
- +
- +#ifdef EHCI_PLATFORM_DRIVER
- + retval = platform_driver_register(&EHCI_PLATFORM_DRIVER);
- + if (retval < 0)
- + goto clean5;
- +#endif
- +
- return retval;
-
- +#ifdef EHCI_PLATFORM_DRIVER
- + platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
- +clean5:
- +#endif
- #ifdef XILINX_OF_PLATFORM_DRIVER
- /* platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER); */
- clean4:
- @@ -1482,6 +1493,9 @@ module_init(ehci_hcd_init);
-
- static void __exit ehci_hcd_cleanup(void)
- {
- +#ifdef EHCI_PLATFORM_DRIVER
- + platform_driver_unregister(&EHCI_PLATFORM_DRIVER);
- +#endif
- #ifdef XILINX_OF_PLATFORM_DRIVER
- platform_driver_unregister(&XILINX_OF_PLATFORM_DRIVER);
- #endif
|
