summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-08-26 10:53:53 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-26 15:22:15 -0700
commitd3474049ab6cfcf14274f5ab9f20c8f50b083eab (patch)
tree42fdb80dbcb67108811660fc0deabfd876a8412c /drivers/usb
parentd8dfad3876e4386666b759da3c833d62fb8b2267 (diff)
downloadop-kernel-dev-d3474049ab6cfcf14274f5ab9f20c8f50b083eab.zip
op-kernel-dev-d3474049ab6cfcf14274f5ab9f20c8f50b083eab.tar.gz
USB: OHCI: fix build error related to ohci_suspend/resume
Commit 9a11899c5e69 (USB: OHCI: add missing PCI PM callbacks to ohci-pci.c) added missing ohci_suspend and ohci_resume callback pointers, but forgot that these callbacks are declared and defined only when CONFIG_PM is enabled. This patch adds a preprocessor conditional to avoid build errors when PM is disabled. Reported-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Guenter Roeck <linux@roeck-us.net> Reported-by: Meelis Roos <mroos@linux.ee>, Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 0f1d193..279b049 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -305,9 +305,11 @@ static int __init ohci_pci_init(void)
ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);
+#ifdef CONFIG_PM
/* Entries for the PCI suspend/resume callbacks are special */
ohci_pci_hc_driver.pci_suspend = ohci_suspend;
ohci_pci_hc_driver.pci_resume = ohci_resume;
+#endif
return pci_register_driver(&ohci_pci_driver);
}
OpenPOWER on IntegriCloud