path: root/drivers
diff options
authorAndiry Xu <andiry.xu@amd.com>2011-03-31 14:56:50 +0800
committerSarah Sharp <sarah.a.sharp@linux.intel.com>2011-04-13 16:57:34 -0700
commita8f08d86dbf1b7bb5869cf1807d2fd40ec9d6d0a (patch)
treefbca783c75f55cac4eaa5de288cce1cf60fe27e8 /drivers
parentb214f191d95ba4b5a35aebd69cd129cf7e3b1884 (diff)
usbcore: Bug fix: system can't suspend with USB3.0 device connected to USB3.0 hub
This patch clear PORT_POWER when suspend a USB3.0 device behind a USB3.0 external hub, so the system can suspend and resume. Note USB3.0 device may not work after system resume and this is a temporary workaround. The correct fix will be in future patches. Signed-off-by: Andiry Xu <andiry.xu@amd.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Diffstat (limited to 'drivers')
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 8fb754916c67..93720bdc9efd 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2285,7 +2285,17 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
/* see */
- status = set_port_feature(hub->hdev, port1, USB_PORT_FEAT_SUSPEND);
+ /* Clear PORT_POWER if it's a USB3.0 device connected to USB 3.0
+ * external hub.
+ * FIXME: this is a temporary workaround to make the system able
+ * to suspend/resume.
+ */
+ if ((hub->hdev->parent != NULL) && hub_is_superspeed(hub->hdev))
+ status = clear_port_feature(hub->hdev, port1,
+ else
+ status = set_port_feature(hub->hdev, port1,
if (status) {
dev_dbg(hub->intfdev, "can't suspend port %d, status %d\n",
port1, status);

Privacy Policy