---

yaml
---
r: 235447
b: refs/heads/master
c: 0c9ffe0
h: refs/heads/master
i:
  235445: 8b3b68e
  235443: 8693f27
  235439: 1b27a41
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 131dec344d5e41f01e4791aa4c80eb4bdb1e5274
+refs/heads/master: 0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1

trunk/drivers/usb/core/hub.c

@@ -1290,8 +1290,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
 	desc = intf->cur_altsetting;
 	hdev = interface_to_usbdev(intf);
 
-	/* Hubs have proper suspend/resume support */
-	usb_enable_autosuspend(hdev);
+	/* Hubs have proper suspend/resume support.  USB 3.0 device suspend is
+	 * different from USB 2.0/1.1 device suspend, and unfortunately we
+	 * don't support it yet.  So leave autosuspend disabled for USB 3.0
+	 * external hubs for now.  Enable autosuspend for USB 3.0 roothubs,
+	 * since that isn't a "real" hub.
+	 */
+	if (!hub_is_superspeed(hdev) || !hdev->parent)
+		usb_enable_autosuspend(hdev);
 
 	if (hdev->level == MAX_TOPO_LEVEL) {
 		dev_err(&intf->dev,