diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2007-11-19 15:57:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:34:51 -0500 |
commit | 269954e542328f014fc07fbb0a986192f7a1cced (patch) | |
tree | 0f5e19458466559fc914f0a0b36061d3f3af0857 | |
parent | 4145ed6dc597a9bea5f6ae8c574653b2de10620f (diff) |
USB: don't change HC power state for a FREEZE
This patch (as1016) prevents PCI-based host controllers from
undergoing a power-state change during a FREEZE or a PRETHAW. Such
changes are needed only during a SUSPEND.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/core/hcd-pci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/hcd-pci.c b/drivers/usb/core/hcd-pci.c index 3fb9af80cbf4..424674203fd3 100644 --- a/drivers/usb/core/hcd-pci.c +++ b/drivers/usb/core/hcd-pci.c | |||
@@ -250,6 +250,12 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message) | |||
250 | pci_disable_device (dev); | 250 | pci_disable_device (dev); |
251 | } | 251 | } |
252 | 252 | ||
253 | if (message.event == PM_EVENT_FREEZE || | ||
254 | message.event == PM_EVENT_PRETHAW) { | ||
255 | dev_dbg(hcd->self.controller, "--> no state change\n"); | ||
256 | goto done; | ||
257 | } | ||
258 | |||
253 | if (!has_pci_pm) { | 259 | if (!has_pci_pm) { |
254 | dev_dbg (hcd->self.controller, "--> PCI D0/legacy\n"); | 260 | dev_dbg (hcd->self.controller, "--> PCI D0/legacy\n"); |
255 | goto done; | 261 | goto done; |