From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Sun, 29 May 2016 00:06:05 +0000 (-0700)
Subject: Merge branch topic/uek-4.1/stable-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-92~150
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=13976abd558ab1ede00830e8184d719f5683873c;p=users%2Fjedix%2Flinux-maple.git

Merge branch topic/uek-4.1/stable-cherry-picks of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
---

13976abd558ab1ede00830e8184d719f5683873c
diff --cc drivers/usb/core/hub.c
index 282d88d2d9a4,3b6a4ac9b14d..5667a109596b
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -4335,11 -4319,10 +4335,11 @@@ hub_port_init (struct usb_hub *hub, str
  	 * first 8 bytes of the device descriptor to get the ep0 maxpacket
  	 * value.
  	 */
- 	for (i = 0; i < GET_DESCRIPTOR_TRIES; (++i, msleep(100))) {
+ 	for (retries = 0; retries < GET_DESCRIPTOR_TRIES; (++retries, msleep(100))) {
  		bool did_new_scheme = false;
  
 -		if (use_new_scheme(udev, retry_counter)) {
 +		if (use_new_scheme(udev, retry_counter) &&
 +		    !(hcd->driver->flags & HCD_USB3)) {
  			struct usb_device_descriptor *buf;
  			int r = 0;