From 6c0e3fa5f0dba1a1241f056980a6e832c7fcb857 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: [PATCH] --- yaml --- r: 348682 b: refs/heads/master c:
 77c7f072c87fa951e9a74805febf26466f31170c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/hub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 740cc8003845..6380b12a720b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e7e056cdc662f704fa9262e5c6e213b4ab45dd
+refs/heads/master: 77c7f072c87fa951e9a74805febf26466f31170c
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 968ec37a0f02..b9ce5e8bda51 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -2499,7 +2499,7 @@ static unsigned hub_is_wusb(struct usb_hub *hub)
 #define HUB_SHORT_RESET_TIME	10
 #define HUB_BH_RESET_TIME	50
 #define HUB_LONG_RESET_TIME	200
-#define HUB_RESET_TIMEOUT	500
+#define HUB_RESET_TIMEOUT	800
 
 static int hub_port_reset(struct usb_hub *hub, int port1,
 			struct usb_device *udev, unsigned int delay, bool warm);