aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2012-11-14 20:16:52 -0500
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2013-01-03 17:10:25 -0500
commit77c7f072c87fa951e9a74805febf26466f31170c (patch)
tree22382b2ef5437b8a1219141004dd8c2d5f728bb8 /drivers/usb
parent41e7e056cdc662f704fa9262e5c6e213b4ab45dd (diff)
USB: Increase reset timeout.
John's NEC 0.96 xHCI host controller needs a longer timeout for a warm reset to complete. The logs show it takes 650ms to complete the warm reset, so extend the hub reset timeout to 800ms to be on the safe side. This commit should be backported to kernels as old as 3.2, that contain the commit 75d7cf72ab9fa01dc70877aa5c68e8ef477229dc "usbcore: refine warm reset logic". Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: John Covici <covici@ccs.covici.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/hub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 968ec37a0f0..b9ce5e8bda5 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2499,7 +2499,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
2499#define HUB_SHORT_RESET_TIME 10 2499#define HUB_SHORT_RESET_TIME 10
2500#define HUB_BH_RESET_TIME 50 2500#define HUB_BH_RESET_TIME 50
2501#define HUB_LONG_RESET_TIME 200 2501#define HUB_LONG_RESET_TIME 200
2502#define HUB_RESET_TIMEOUT 500 2502#define HUB_RESET_TIMEOUT 800
2503 2503
2504static int hub_port_reset(struct usb_hub *hub, int port1, 2504static int hub_port_reset(struct usb_hub *hub, int port1,
2505 struct usb_device *udev, unsigned int delay, bool warm); 2505 struct usb_device *udev, unsigned int delay, bool warm);