3.0-stable patches

added patches:
	usb-increase-reset-timeout.patch

diff --git a/queue-3.0/series b/queue-3.0/series
index 79bd80b29af0721026ea3bb7ddaf456820cf3fa0..f98a4d2f2667bcf35605bc4ead290711d5ce408e 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -60,3 +60,4 @@ usb-option-add-telekom-speedstick-lte-ii.patch
 usb-ftdi_sio-crucible-technologies-comet-caller-id-pid-added.patch
 usb-cdc-acm-add-support-for-psc-scanning-magellan-800i.patch
 usb-gadget-dummy-fix-enumeration-with-g_multi.patch
+usb-increase-reset-timeout.patch

diff --git a/queue-3.0/usb-increase-reset-timeout.patch b/queue-3.0/usb-increase-reset-timeout.patch
new file mode 100644 (file)
index 0000000..263a6fe
--- /dev/null
+++ b/queue-3.0/usb-increase-reset-timeout.patch
@@ -0,0 +1,37 @@
+From 77c7f072c87fa951e9a74805febf26466f31170c Mon Sep 17 00:00:00 2001
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+Date: Wed, 14 Nov 2012 17:16:52 -0800
+Subject: USB: Increase reset timeout.
+
+From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
+
+commit 77c7f072c87fa951e9a74805febf26466f31170c upstream.
+
+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>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/core/hub.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -2050,7 +2050,7 @@ static unsigned hub_is_wusb(struct usb_h
+ #define HUB_ROOT_RESET_TIME   50      /* times are in msec */
+ #define HUB_SHORT_RESET_TIME  10
+ #define HUB_LONG_RESET_TIME   200
+-#define HUB_RESET_TIMEOUT     500
++#define HUB_RESET_TIMEOUT     800
+ 
+ static int hub_port_wait_reset(struct usb_hub *hub, int port1,
+                               struct usb_device *udev, unsigned int delay)