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

Pull USB fixes from Greg KH:
 "Here are some fixes for 3.15-rc8 that resolve a number of tiny USB
  issues that have been reported, and there are some new device ids as
  well.

  All have been tested in linux-next"

* tag 'usb-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  xhci: delete endpoints from bandwidth list before freeing whole device
  usb: pci-quirks: Prevent Sony VAIO t-series from switching usb ports
  USB: cdc-wdm: properly include types.h
  usb: cdc-wdm: export cdc-wdm uapi header
  USB: serial: option: add support for Novatel E371 PCIe card
  USB: ftdi_sio: add NovaTech OrionLXm product ID
  USB: io_ti: fix firmware download on big-endian machines (part 2)
  USB: Avoid runtime suspend loops for HCDs that can't handle suspend/resume

2 files changed, 19 insertions, 5 deletions

diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 888881e5f292..4aeb10034de7 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -1822,10 +1822,13 @@ int usb_runtime_suspend(struct device *dev)
         if (status == -EAGAIN || status == -EBUSY)
                 usb_mark_last_busy(udev);
 
-        /* The PM core reacts badly unless the return code is 0,
-         * -EAGAIN, or -EBUSY, so always return -EBUSY on an error.
+        /*
+         * The PM core reacts badly unless the return code is 0,
+         * -EAGAIN, or -EBUSY, so always return -EBUSY on an error
+         * (except for root hubs, because they don't suspend through
+         * an upstream port like other USB devices).
          */
-        if (status != 0)
+        if (status != 0 && udev->parent)
                 return -EBUSY;
         return status;
 }
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 090469ebfcff..229a73f64304 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1691,8 +1691,19 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
          */
         pm_runtime_set_autosuspend_delay(&hdev->dev, 0);
 
-        /* Hubs have proper suspend/resume support. */
-        usb_enable_autosuspend(hdev);
+        /*
+         * Hubs have proper suspend/resume support, except for root hubs
+         * where the controller driver doesn't have bus_suspend and
+         * bus_resume methods.
+         */
+        if (hdev->parent) {             /* normal device */
+                usb_enable_autosuspend(hdev);
+        } else {                        /* root hub */
+                const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver;
+
+                if (drv->bus_suspend && drv->bus_resume)
+                        usb_enable_autosuspend(hdev);
+        }
 
         if (hdev->level == MAX_TOPO_LEVEL) {
                 dev_err(&intf->dev,