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

Pull USB updates from Greg KH:
 "Here's the big set of USB and PHY patches for 3.19-rc1.

  The normal churn in the USB gadget area is in here, as well as xhci
  and other individual USB driver updates.  The PHY tree is also in
  here, as there were dependancies on the USB tree.

  All of these have been in linux-next"

* tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (351 commits)
  arm: omap3: twl: remove usb phy init data
  usbip: fix error handling in stub_probe()
  usb: gadget: udc: missing curly braces
  USB: mos7720: delete some unneeded code
  wusb: replace memset by memzero_explicit
  usbip: remove unneeded structure
  usb: xhci: fix comment for PORT_DEV_REMOVE
  xhci: don't use the same variable for stopped and halted rings current TD
  xhci: clear extra bits from slot context when setting max exit latency
  xhci: cleanup finish_td function
  USB: adutux: NULL dereferences on disconnect
  usb: chipidea: fix platform_no_drv_owner.cocci warnings
  usb: chipidea: Fixed a few typos in comments
  Documentation: bindings: add doc for the USB2 ChipIdea USB driver
  usb: chipidea: add a usb2 driver for ci13xxx
  usb: chipidea: fix phy handling
  usb: chipidea: remove duplicate dev_set_drvdata for host_start
  usb: chipidea: parameter 'mode' isn't needed for hw_device_reset
  usb: chipidea: add controller reset API
  usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER
  ...

2 files changed, 12 insertions, 13 deletions

diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index 278be0515e8e..11cee55ae397 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -2646,7 +2646,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
                 }
         }
 
-        if (IS_ENABLED(CONFIG_GENERIC_PHY)) {
+        if (IS_ENABLED(CONFIG_GENERIC_PHY) && !hcd->phy) {
                 struct phy *phy = phy_get(hcd->self.controller, "usb");
 
                 if (IS_ERR(phy)) {
@@ -2666,6 +2666,7 @@ int usb_add_hcd(struct usb_hcd *hcd,
                                 goto err_phy;
                         }
                         hcd->phy = phy;
+                        hcd->remove_phy = 1;
                 }
         }
 
@@ -2812,7 +2813,7 @@ err_allocate_root_hub:
 err_register_bus:
         hcd_buffer_destroy(hcd);
 err_create_buf:
-        if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->phy) {
+        if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->remove_phy && hcd->phy) {
                 phy_power_off(hcd->phy);
                 phy_exit(hcd->phy);
                 phy_put(hcd->phy);
@@ -2896,7 +2897,7 @@ void usb_remove_hcd(struct usb_hcd *hcd)
         usb_deregister_bus(&hcd->self);
         hcd_buffer_destroy(hcd);
 
-        if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->phy) {
+        if (IS_ENABLED(CONFIG_GENERIC_PHY) && hcd->remove_phy && hcd->phy) {
                 phy_power_off(hcd->phy);
                 phy_exit(hcd->phy);
                 phy_put(hcd->phy);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index c9596525ba8c..aeb50bb6ba9c 100644
--- 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",