kernel: update 4.1 to 4.1.4
[openwrt/openwrt.git] / target / linux / lantiq / patches-4.1 / 0032-USB-fix-roothub-for-IFXHCD.patch
1 From 326714a47233e4a524afa0c8398276fddf0dbd4d 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/36] 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 --- a/arch/mips/lantiq/Kconfig
12 +++ b/arch/mips/lantiq/Kconfig
13 @@ -3,6 +3,7 @@ if LANTIQ
14 config SOC_TYPE_XWAY
15 bool
16 select PINCTRL_XWAY
17 + select USB_ARCH_HAS_HCD
18 default n
19
20 choice
21 --- a/drivers/usb/core/hub.c
22 +++ b/drivers/usb/core/hub.c
23 @@ -4298,7 +4298,7 @@ hub_port_init (struct usb_hub *hub, stru
24 udev->ttport = hdev->ttport;
25 } else if (udev->speed != USB_SPEED_HIGH
26 && hdev->speed == USB_SPEED_HIGH) {
27 - if (!hub->tt.hub) {
28 + if (hdev->parent && !hub->tt.hub) {
29 dev_err(&udev->dev, "parent hub has no TT\n");
30 retval = -EINVAL;
31 goto fail;