Merge 3.14-rc6 into usb-next

We want the USB fixes in here as well.
2014-03-12 11:40:15 -07:00
parent ea1990c379 fa389e2202
commit 192c028b6a
304 changed files with 2865 additions and 1687 deletions
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -716,6 +716,10 @@ int usb_get_configuration(struct usb_device *dev)
 			result = -ENOMEM;
 			goto err;
 		}
+
+		if (dev->quirks & USB_QUIRK_DELAY_INIT)
+			msleep(100);
+
 		result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno,
 		    bigbuffer, length);
 		if (result < 0) {