diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-09-24 15:45:25 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-05 10:13:10 -0400 |
| commit | c9dd3462b3f99a4a397b7d90265c2e21831ed3a0 (patch) | |
| tree | efa14c970270d88436975b9c0c6182351d5dd691 /drivers/usb/host/ehci-pci.c | |
| parent | a9b9047e6dcdfa8472b39d5a3c374d74d89a7f4d (diff) | |
USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd
commit f875fdbf344b9fde207f66b392c40845dd7e5aa6 upstream.
Since uhci-hcd, ehci-hcd, and xhci-hcd support runtime PM, the .pm
field in their pci_driver structures should be protected by CONFIG_PM
rather than CONFIG_PM_SLEEP. The corresponding change has already
been made for ohci-hcd.
Without this change, controllers won't do runtime suspend if system
suspend or hibernation isn't enabled.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
| -rw-r--r-- | drivers/usb/host/ehci-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 595d210655b6..8fe401c7d152 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c | |||
| @@ -403,7 +403,7 @@ static struct pci_driver ehci_pci_driver = { | |||
| 403 | .remove = usb_hcd_pci_remove, | 403 | .remove = usb_hcd_pci_remove, |
| 404 | .shutdown = usb_hcd_pci_shutdown, | 404 | .shutdown = usb_hcd_pci_shutdown, |
| 405 | 405 | ||
| 406 | #ifdef CONFIG_PM_SLEEP | 406 | #ifdef CONFIG_PM |
| 407 | .driver = { | 407 | .driver = { |
| 408 | .pm = &usb_hcd_pci_pm_ops | 408 | .pm = &usb_hcd_pci_pm_ops |
| 409 | }, | 409 | }, |