1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 04f986d9234f..47390e369cd4 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -190,6 +190,10 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         struct usb_hcd *hcd;
 
         driver = (struct hc_driver *)id->driver_data;
+
+        /* Prevent runtime suspending between USB-2 and USB-3 initialization */
+        pm_runtime_get_noresume(&dev->dev);
+
         /* Register the USB 2.0 roothub.
          * FIXME: USB core must know to register the USB 2.0 roothub first.
          * This is sort of silly, because we could just set the HCD driver flags
@@ -199,7 +203,7 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         retval = usb_hcd_pci_probe(dev, id);
 
         if (retval)
-                return retval;
+                goto put_runtime_pm;
 
         /* USB 2.0 roothub is stored in the PCI device now. */
         hcd = dev_get_drvdata(&dev->dev);
@@ -222,11 +226,11 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 goto put_usb3_hcd;
         /* Roothub already marked as USB 3.0 speed */
 
-        /* We know the LPM timeout algorithms for this host, let the USB core
-         * enable and disable LPM for devices under the USB 3.0 roothub.
-         */
-        if (xhci->quirks & XHCI_LPM_SUPPORT)
-                hcd_to_bus(xhci->shared_hcd)->root_hub->lpm_capable = 1;
+        if (HCC_MAX_PSA(xhci->hcc_params) >= 4)
+                xhci->shared_hcd->can_do_streams = 1;
+
+        /* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
+        pm_runtime_put_noidle(&dev->dev);
 
         return 0;
 
@@ -234,6 +238,8 @@ put_usb3_hcd:
         usb_put_hcd(xhci->shared_hcd);
 dealloc_usb2_hcd:
         usb_hcd_pci_remove(dev);
+put_runtime_pm:
+        pm_runtime_put_noidle(&dev->dev);
         return retval;
 }