diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-08-26 15:01:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-28 00:36:46 -0400 |
| commit | 69820e01aa756b8d228143d997f71523c1e97984 (patch) | |
| tree | 438c9249db2a25bcb0627343945ba32e037c82d5 | |
| parent | d143a8edcd4e84498e419a33a2af56b3e3a17b9a (diff) | |
USB: OHCI: Allow runtime PM without system sleep
Since ohci-hcd supports runtime PM, the .pm field in its pci_driver
structure should be protected by CONFIG_PM rather than
CONFIG_PM_SLEEP.
Without this change, OHCI controllers won't do runtime suspend if
system suspend or hibernation isn't enabled.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
cc: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/host/ohci-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 08613e241894..767a5eeff848 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
| @@ -289,7 +289,7 @@ static struct pci_driver ohci_pci_driver = { | |||
| 289 | .remove = usb_hcd_pci_remove, | 289 | .remove = usb_hcd_pci_remove, |
| 290 | .shutdown = usb_hcd_pci_shutdown, | 290 | .shutdown = usb_hcd_pci_shutdown, |
| 291 | 291 | ||
| 292 | #ifdef CONFIG_PM_SLEEP | 292 | #ifdef CONFIG_PM |
| 293 | .driver = { | 293 | .driver = { |
| 294 | .pm = &usb_hcd_pci_pm_ops | 294 | .pm = &usb_hcd_pci_pm_ops |
| 295 | }, | 295 | }, |