Commit f875fdbf authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd

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: default avatarAlan Stern <stern@rowland.harvard.edu>
CC: Sarah Sharp <sarah.a.sharp@linux.intel.com>
CC: <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a8693424
...@@ -361,7 +361,7 @@ static struct pci_driver ehci_pci_driver = { ...@@ -361,7 +361,7 @@ static struct pci_driver ehci_pci_driver = {
.remove = usb_hcd_pci_remove, .remove = usb_hcd_pci_remove,
.shutdown = usb_hcd_pci_shutdown, .shutdown = usb_hcd_pci_shutdown,
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM
.driver = { .driver = {
.pm = &usb_hcd_pci_pm_ops .pm = &usb_hcd_pci_pm_ops
}, },
......
...@@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver = { ...@@ -293,7 +293,7 @@ static struct pci_driver uhci_pci_driver = {
.remove = usb_hcd_pci_remove, .remove = usb_hcd_pci_remove,
.shutdown = uhci_shutdown, .shutdown = uhci_shutdown,
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM
.driver = { .driver = {
.pm = &usb_hcd_pci_pm_ops .pm = &usb_hcd_pci_pm_ops
}, },
......
...@@ -351,7 +351,7 @@ static struct pci_driver xhci_pci_driver = { ...@@ -351,7 +351,7 @@ static struct pci_driver xhci_pci_driver = {
/* suspend and resume implemented later */ /* suspend and resume implemented later */
.shutdown = usb_hcd_pci_shutdown, .shutdown = usb_hcd_pci_shutdown,
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM
.driver = { .driver = {
.pm = &usb_hcd_pci_pm_ops .pm = &usb_hcd_pci_pm_ops
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment