| From: Alan Stern <stern@rowland.harvard.edu> |
| Date: Mon, 26 Aug 2013 15:01:40 -0400 |
| Subject: 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> |
| --- |
| drivers/usb/host/ohci-pci.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 |
| }, |
