diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-01-17 13:54:14 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-01-17 13:54:14 +0000 |
| commit | a96196039fdd13706de9bc269038e63c3bf2e48d (patch) | |
| tree | f39d28fd89c5b7e437acb134db65df6b86817502 /target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch | |
| parent | dc2e5bd9443d2e53102306825819010bdf8db23c (diff) | |
| download | upstream-a96196039fdd13706de9bc269038e63c3bf2e48d.tar.gz upstream-a96196039fdd13706de9bc269038e63c3bf2e48d.tar.bz2 upstream-a96196039fdd13706de9bc269038e63c3bf2e48d.zip | |
generic: add EHCI|OHCI platform driver fix to 3.[36]
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35194 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch b/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch new file mode 100644 index 0000000000..9bf509768c --- /dev/null +++ b/target/linux/generic/patches-3.3/801-usb-ehci-multiple-platform-driver-fix.patch @@ -0,0 +1,47 @@ +--- 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 |