diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2013-08-21 10:33:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-23 13:41:46 -0400 |
commit | 9a11899c5e699a8d2551692dfcd4372e39dcbdf6 (patch) | |
tree | 7dcd51261937317e6e4a1a1eb7b7a174ca1c5ac2 | |
parent | b36f4be3de1b123d8601de062e7dbfc904f305fb (diff) |
USB: OHCI: add missing PCI PM callbacks to ohci-pci.c
Commit c1117afb8589 (USB: OHCI: make ohci-pci a separate driver)
neglected to preserve the entries for the pci_suspend and pci_resume
driver callbacks. As a result, OHCI controllers don't work properly
during suspend and after hibernation.
This patch adds the missing callbacks to the driver.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: Steve Cotton <steve@s.cotton.clara.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/host/ohci-pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 08613e241894..0f1d193fef02 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c | |||
@@ -304,6 +304,11 @@ static int __init ohci_pci_init(void) | |||
304 | pr_info("%s: " DRIVER_DESC "\n", hcd_name); | 304 | pr_info("%s: " DRIVER_DESC "\n", hcd_name); |
305 | 305 | ||
306 | ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides); | 306 | ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides); |
307 | |||
308 | /* Entries for the PCI suspend/resume callbacks are special */ | ||
309 | ohci_pci_hc_driver.pci_suspend = ohci_suspend; | ||
310 | ohci_pci_hc_driver.pci_resume = ohci_resume; | ||
311 | |||
307 | return pci_register_driver(&ohci_pci_driver); | 312 | return pci_register_driver(&ohci_pci_driver); |
308 | } | 313 | } |
309 | module_init(ohci_pci_init); | 314 | module_init(ohci_pci_init); |