Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[android-x86/kernel.git] / drivers / usb / core / hub.c

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c959652..aeb50bb 100644 (file)
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2543,11 +2543,14 @@ int usb_authorize_device(struct usb_device *usb_dev)
                        "can't autoresume for authorization: %d\n", result);
                goto error_autoresume;
        }
-       result = usb_get_device_descriptor(usb_dev, sizeof(usb_dev->descriptor));
-       if (result < 0) {
-               dev_err(&usb_dev->dev, "can't re-read device descriptor for "
-                       "authorization: %d\n", result);
-               goto error_device_descriptor;
+
+       if (usb_dev->wusb) {
+               result = usb_get_device_descriptor(usb_dev, sizeof(usb_dev->descriptor));
+               if (result < 0) {
+                       dev_err(&usb_dev->dev, "can't re-read device descriptor for "
+                               "authorization: %d\n", result);
+                       goto error_device_descriptor;
+               }
        }
 
        usb_dev->authorized = 1;
@@ -3907,14 +3910,9 @@ static void usb_enable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
 static int usb_disable_link_state(struct usb_hcd *hcd, struct usb_device *udev,
                enum usb3_link_state state)
 {
-       int feature;
-
        switch (state) {
        case USB3_LPM_U1:
-               feature = USB_PORT_FEAT_U1_TIMEOUT;
-               break;
        case USB3_LPM_U2:
-               feature = USB_PORT_FEAT_U2_TIMEOUT;
                break;
        default:
                dev_warn(&udev->dev, "%s: Can't disable non-U1 or U2 state.\n",