---

yaml --- r: 303985 b: refs/heads/master c: c3e751e h: refs/heads/master i: 303983: 0257a0d v: v3
git-mirror · May 17, 2012 · da069ef · da069ef
1 parent b3c575b
commit da069ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1530bbc6272d9da1e39ef8e06190d42c13a02733
+refs/heads/master: c3e751e4f4754793bb52bd5ae30e9cc027edbb12
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
@@ -2499,6 +2499,10 @@ int usb_port_suspend(struct usb_device *udev, pm_message_t msg)
 				NULL, 0,
 				USB_CTRL_SET_TIMEOUT);
 
+		/* Try to enable USB2 hardware LPM again */
+		if (udev->usb2_hw_lpm_capable == 1)
+			usb_set_usb2_hardware_lpm(udev, 1);
+
 		/* System sleep transitions should never fail */
 		if (!PMSG_IS_AUTO(msg))
 			status = 0;