2013-09-18 05:46:10 +08:00
|
|
|
From 4f861316af87a73fd8738df5436742f9425561b3 Mon Sep 17 00:00:00 2001
|
2013-03-15 02:42:29 +08:00
|
|
|
From: John Crispin <blogic@openwrt.org>
|
|
|
|
|
Date: Thu, 6 Dec 2012 19:59:53 +0100
|
2013-09-18 05:46:10 +08:00
|
|
|
Subject: [PATCH 32/34] USB: fix roothub for IFXHCD
|
2013-03-15 02:42:29 +08:00
|
|
|
|
|
|
|
|
---
|
|
|
|
|
arch/mips/lantiq/Kconfig | 1 +
|
|
|
|
|
drivers/usb/core/hub.c | 2 +-
|
|
|
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
2013-09-18 05:46:10 +08:00
|
|
|
diff --git a/arch/mips/lantiq/Kconfig b/arch/mips/lantiq/Kconfig
|
|
|
|
|
index 1621b1d..4c9a241 100644
|
2013-03-15 02:42:29 +08:00
|
|
|
--- a/arch/mips/lantiq/Kconfig
|
|
|
|
|
+++ b/arch/mips/lantiq/Kconfig
|
|
|
|
|
@@ -3,6 +3,7 @@ if LANTIQ
|
|
|
|
|
config SOC_TYPE_XWAY
|
|
|
|
|
bool
|
|
|
|
|
select PINCTRL_XWAY
|
|
|
|
|
+ select USB_ARCH_HAS_HCD
|
|
|
|
|
default n
|
|
|
|
|
|
|
|
|
|
choice
|
2013-09-18 05:46:10 +08:00
|
|
|
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
|
|
|
|
index feef935..db4fb8e 100644
|
2013-03-15 02:42:29 +08:00
|
|
|
--- a/drivers/usb/core/hub.c
|
|
|
|
|
+++ b/drivers/usb/core/hub.c
|
2013-09-18 05:46:10 +08:00
|
|
|
@@ -4009,7 +4009,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
|
2013-03-15 02:42:29 +08:00
|
|
|
udev->ttport = hdev->ttport;
|
|
|
|
|
} else if (udev->speed != USB_SPEED_HIGH
|
|
|
|
|
&& hdev->speed == USB_SPEED_HIGH) {
|
|
|
|
|
- if (!hub->tt.hub) {
|
|
|
|
|
+ if (hdev->parent && !hub->tt.hub) {
|
|
|
|
|
dev_err(&udev->dev, "parent hub has no TT\n");
|
|
|
|
|
retval = -EINVAL;
|
|
|
|
|
goto fail;
|
2013-09-18 05:46:10 +08:00
|
|
|
--
|
|
|
|
|
1.7.10.4
|
|
|
|
|
|
