wusb: devices dont use a set address

A WUSB device gets his address during the connection phase; later on,
during the authenthication phase (driven from user space) we assign
the final address. So we need to skip in hub_port_init() the actual
setting of the address for WUSB devices.

Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 27 insertions, 20 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index baae2aa0dbf6..1815034ccb7a 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2419,26 +2419,33 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
 #undef GET_DESCRIPTOR_BUFSIZE
                 }
 
-                for (j = 0; j < SET_ADDRESS_TRIES; ++j) {
-                        retval = hub_set_address(udev, devnum);
-                        if (retval >= 0)
+                /*
+                 * If device is WUSB, we already assigned an
+                 * unauthorized address in the Connect Ack sequence;
+                 * authorization will assign the final address.
+                 */
+                if (udev->wusb == 0) {
+                        for (j = 0; j < SET_ADDRESS_TRIES; ++j) {
+                                retval = hub_set_address(udev, devnum);
+                                if (retval >= 0)
+                                        break;
+                                msleep(200);
+                        }
+                        if (retval < 0) {
+                                dev_err(&udev->dev,
+                                        "device not accepting address %d, error %d\n",
+                                        devnum, retval);
+                                goto fail;
+                        }
+
+                        /* cope with hardware quirkiness:
+                         *  - let SET_ADDRESS settle, some device hardware wants it
+                         *  - read ep0 maxpacket even for high and low speed,
+                         */
+                        msleep(10);
+                        if (USE_NEW_SCHEME(retry_counter))
                                 break;
-                        msleep(200);
-                }
-                if (retval < 0) {
-                        dev_err(&udev->dev,
-                                "device not accepting address %d, error %d\n",
-                                devnum, retval);
-                        goto fail;
-                }
- 
-                /* cope with hardware quirkiness:
-                 *  - let SET_ADDRESS settle, some device hardware wants it
-                 *  - read ep0 maxpacket even for high and low speed,
-                 */
-                msleep(10);
-                if (USE_NEW_SCHEME(retry_counter))
-                        break;
+                }
 
                 retval = usb_get_device_descriptor(udev, 8);
                 if (retval < 8) {
@@ -2455,7 +2462,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
         if (retval)
                 goto fail;
 
-        i = udev->descriptor.bMaxPacketSize0 == 0xff?
+        i = udev->descriptor.bMaxPacketSize0 == 0xff?   /* wusb device? */
             512 : udev->descriptor.bMaxPacketSize0;
         if (le16_to_cpu(udev->ep0.desc.wMaxPacketSize) != i) {
                 if (udev->speed != USB_SPEED_FULL ||