aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSarah Sharp <sarah.a.sharp@linux.intel.com>2010-12-30 13:27:36 -0800
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-03-13 18:23:51 -0700
commit0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1 (patch)
treee17413d6b9451fe5ea5fa0a51ff923689d356254
parent131dec344d5e41f01e4791aa4c80eb4bdb1e5274 (diff)
downloadkernel_samsung_espresso10-0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1.zip
kernel_samsung_espresso10-0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1.tar.gz
kernel_samsung_espresso10-0c9ffe0f6286a02bf82f8d7fb7274aec2ad977f1.tar.bz2
USB: Disable auto-suspend for USB 3.0 hubs.
USB 3.0 devices have a slightly different suspend sequence than USB 2.0/1.1 devices. There isn't support for USB 3.0 device suspend yet, so make khubd leave autosuspend disabled for USB 3.0 hubs. Make sure that USB 3.0 roothubs still have autosuspend enabled, since that path in the xHCI driver works fine. Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
-rw-r--r--drivers/usb/core/hub.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 13aafd1..0968157 100644
--- a/drivers/usb/core/hub.c
+++ b/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,