From bede2cc0ee90b38c44c02ab201bccf68cf0d10c5 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 19 Nov 2007 15:57:45 -0500
Subject: [PATCH] --- yaml --- r: 82210 b: refs/heads/master c:
 269954e542328f014fc07fbb0a986192f7a1cced h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/core/hcd-pci.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e662aa09a28d..5df37dc60e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4145ed6dc597a9bea5f6ae8c574653b2de10620f
+refs/heads/master: 269954e542328f014fc07fbb0a986192f7a1cced
diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c
index 3fb9af80cbf4..424674203fd3 100644
--- a/trunk/drivers/usb/core/hcd-pci.c
+++ b/trunk/drivers/usb/core/hcd-pci.c
@@ -250,6 +250,12 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message)
 			pci_disable_device (dev);
 		}
 
+		if (message.event == PM_EVENT_FREEZE ||
+				message.event == PM_EVENT_PRETHAW) {
+			dev_dbg(hcd->self.controller, "--> no state change\n");
+			goto done;
+		}
+
 		if (!has_pci_pm) {
 			dev_dbg (hcd->self.controller, "--> PCI D0/legacy\n");
 			goto done;