AOSCOS: Retry to configure USB device if needed

[Mingcong Bai: Resolved a minor merge conflict in
drivers/usb/core/message.c.]

Signed-off-by: Huacai Chen <chenhc@lemote.com>

Signed-off-by: Kexy Biscuit <kexybiscuit@aosc.io>

Author: chenhuacai

drivers/usb/core/message.c

@@ -1999,7 +1999,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 	struct usb_host_config *cp = NULL;
 	struct usb_interface **new_interfaces = NULL;
 	struct usb_hcd *hcd = bus_to_hcd(dev->bus);
-	int n, nintf;
+	int n, nintf, retried = 0;
 
 	if (dev->authorized == 0 || configuration == -1)
 		configuration = 0;
@@ -2148,6 +2148,7 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 	}
 	kfree(new_interfaces);
 
+retry:
 	ret = usb_control_msg_send(dev, 0, USB_REQ_SET_CONFIGURATION, 0,
 				   configuration, 0, NULL, 0,
 				   USB_CTRL_SET_TIMEOUT, GFP_NOIO);
@@ -2156,6 +2157,12 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
 		 * All the old state is gone, so what else can we do?
 		 * The device is probably useless now anyway.
 		 */
+		if (!retried) {
+			retried = 1;
+			printk("Retry to configure %d-%s!\n", dev->bus->busnum, dev->devpath);
+			goto retry;
+		}
+
 		usb_hcd_alloc_bandwidth(dev, NULL, NULL, NULL);
 		for (i = 0; i < nintf; ++i) {
 			usb_disable_interface(dev, cp->interface[i], true);