diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-08-26 15:01:40 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-10-26 21:06:00 +0100 |
| commit | 60d3bfb16dc6db40932968fef856b81c625f8cec (patch) | |
| tree | 96b3f37233a368b84163ef9d5108ae1edd56fa0c /drivers/usb/host | |
| parent | 332ad48cc7df186cf82659c7ef50be87b91572b3 (diff) | |
| download | kernel_samsung_smdk4412-60d3bfb16dc6db40932968fef856b81c625f8cec.zip kernel_samsung_smdk4412-60d3bfb16dc6db40932968fef856b81c625f8cec.tar.gz kernel_samsung_smdk4412-60d3bfb16dc6db40932968fef856b81c625f8cec.tar.bz2 | |
USB: OHCI: Allow runtime PM without system sleep
commit 69820e01aa756b8d228143d997f71523c1e97984 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/host')
| -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 bc01b06..839cb64 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -413,7 +413,7 @@ static struct pci_driver ohci_pci_driver = { .remove = usb_hcd_pci_remove, .shutdown = usb_hcd_pci_shutdown, -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_PM .driver = { .pm = &usb_hcd_pci_pm_ops }, |