Commit 69820e01 authored Aug 26, 2013 by Alan Stern Committed by Greg Kroah-Hartman Aug 27, 2013

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>

parent d143a8ed

drivers/usb/host/ohci-pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,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
		},

Admin message