Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next

Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
	drivers/gpu/drm/drm_crtc_helper.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/i915_gem_gtt.c

1 files changed, 13 insertions, 2 deletions

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,