lantiq: add v3.10 patches
[openwrt/svn-archive/archive.git] / target / linux / lantiq / patches-3.10 / 0032-USB-fix-roothub-for-IFXHCD.patch
1 From 4f861316af87a73fd8738df5436742f9425561b3 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Thu, 6 Dec 2012 19:59:53 +0100
4 Subject: [PATCH 32/34] USB: fix roothub for IFXHCD
5
6 ---
7 arch/mips/lantiq/Kconfig | 1 +
8 drivers/usb/core/hub.c | 2 +-
9 2 files changed, 2 insertions(+), 1 deletion(-)
10
11 diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig
12 index 1621b1d..4c9a241 100644
13 --- a/arch/mips/lantiq/Kconfig
14 +++ b/arch/mips/lantiq/Kconfig
15 @@ -3,6 +3,7 @@ if LANTIQ
16 config SOC_TYPE_XWAY
17 bool
18 select PINCTRL_XWAY
19 + select USB_ARCH_HAS_HCD
20 default n
21
22 choice
23 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
24 index feef935..db4fb8e 100644
25 --- a/drivers/usb/core/hub.c
26 +++ b/drivers/usb/core/hub.c
27 @@ -4009,7 +4009,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
28 udev->ttport = hdev->ttport;
29 } else if (udev->speed != USB_SPEED_HIGH
30 && hdev->speed == USB_SPEED_HIGH) {
31 - if (!hub->tt.hub) {
32 + if (hdev->parent && !hub->tt.hub) {
33 dev_err(&udev->dev, "parent hub has no TT\n");
34 retval = -EINVAL;
35 goto fail;
36 --
37 1.7.10.4
38