USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd (f875fdbf) · Commits · 戴 / test

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> CC: <stable@vger.kernel.org> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/host/ehci-pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,7 @@ static struct pci_driver ehci_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
		},

drivers/usb/host/uhci-pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver = {
		.remove = usb_hcd_pci_remove,
		.shutdown = uhci_shutdown,

		#ifdef CONFIG_PM_SLEEP
		#ifdef CONFIG_PM
		.driver = {
		.pm = &usb_hcd_pci_pm_ops
		},

drivers/usb/host/xhci-pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,7 @@ static struct pci_driver xhci_pci_driver = {
		/* suspend and resume implemented later */

		.shutdown = usb_hcd_pci_shutdown,
		#ifdef CONFIG_PM_SLEEP
		#ifdef CONFIG_PM
		.driver = {
		.pm = &usb_hcd_pci_pm_ops
		},

Admin message