From da069efde09c60bd661f29ed4dfdeeeb699ed580 Mon Sep 17 00:00:00 2001
From: Andiry Xu <andiry.xu@gmail.com>
Date: Sat, 5 May 2012 00:50:10 +0800
Subject: [PATCH] --- yaml --- r: 303985 b: refs/heads/master c:
 c3e751e4f4754793bb52bd5ae30e9cc027edbb12 h: refs/heads/master i:   303983:
 0257a0ddfbf2b4bfbba0c225a63ff59afac9f5c6 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/hub.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33e6509d6320..549cff76badc 100644
--- 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
index ec6c97dadbe4..c8e0704c6e5d 100644
--- 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;