diff options
| author | Hector Palacios <hector.palacios@digi.com> | 2011-02-01 17:02:40 +0100 |
|---|---|---|
| committer | Hector Palacios <hector.palacios@digi.com> | 2011-02-01 17:56:38 +0100 |
| commit | 0d29da6da44d8abe8ab0f427a46f0c93cdc72c96 (patch) | |
| tree | e8f69738808da15b66f5e340123816eb3961b641 /drivers/usb/core | |
| parent | 37e6606b1e1762e5e9b9301ea5f8f540271260c4 (diff) | |
| parent | 3225afe4c4d14545424963f109ede2bb400bf7e2 (diff) | |
Merge branch 'hpalacio/2.6.35_merged' into master (2.6.35)
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
drivers/mtd/nand/Makefile
drivers/net/can/Makefile
drivers/net/smsc9118/smsc911x.c
drivers/net/wireless/Kconfig
drivers/net/wireless/Makefile
drivers/spi/Kconfig
drivers/spi/Makefile
The following files were wrongly merged by git automatic merge tool
and have to be reset to v2.6.35 version
drivers/net/phy.c
include/linux/phy.h
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
Diffstat (limited to 'drivers/usb/core')
| -rw-r--r-- | drivers/usb/core/hub.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 68bf58c0f876..1484a504bba5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -973,6 +973,17 @@ static int hub_configure(struct usb_hub *hub, goto fail; } + /* + * The second USB-port of the S3C2443 is generating interrupts, although + * it's configured for the USB-device controller, and not for the USB-host. + * This seems to be a hardware BUG. + * (Luis Galdos) + */ +#if (defined(CONFIG_MACH_CC9M2443JS) || defined(CONFIG_MACH_CCW9M2443JS)) && defined(CONFIG_USB_GADGET_S3C2443) + /* Only use one port by the internal Root-Hub (devnum = 1) */ + if (hdev->devnum == 1) + hub->descriptor->bNbrPorts = 1; +#endif hdev->maxchild = hub->descriptor->bNbrPorts; dev_info (hub_dev, "%d port%s detected\n", hdev->maxchild, (hdev->maxchild == 1) ? "" : "s"); |