summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-08-21 16:33:17 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-23 19:41:46 +0200
commit9a11899c5e699a8d2551692dfcd4372e39dcbdf6 (patch)
tree7dcd51261937317e6e4a1a1eb7b7a174ca1c5ac2
parentLinux 3.11-rc6 (diff)
downloadlinux-9a11899c5e699a8d2551692dfcd4372e39dcbdf6.tar.xz
linux-9a11899c5e699a8d2551692dfcd4372e39dcbdf6.zip
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.c5
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)
pr_info("%s: " DRIVER_DESC "\n", hcd_name);
ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);
+
+ /* 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;
+
return pci_register_driver(&ohci_pci_driver);
}
module_init(ohci_pci_init);