USB: Fix suspend-resume of PCI USB controllers

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ehci-pci.c

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index bdc6e86e1f8b0aed2a6d505f618ed1bdd0a43b50..bb21fb0a4969d0bc793f22c091c5053b973ddeac 100644 (file)
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -230,7 +230,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                pci_read_config_word(pdev, 0x62, &port_wake);
                if (port_wake & 0x0001) {
                        dev_warn(&pdev->dev, "Enabling legacy PCI PM\n");
-                       device_init_wakeup(&pdev->dev, 1);
+                       device_set_wakeup_capable(&pdev->dev, 1);
                }
        }
 
@@ -432,7 +432,6 @@ static struct pci_driver ehci_pci_driver = {
 
 #ifdef CONFIG_PM
        .suspend =      usb_hcd_pci_suspend,
-       .suspend_late = usb_hcd_pci_suspend_late,
        .resume_early = usb_hcd_pci_resume_early,
        .resume =       usb_hcd_pci_resume,
 #endif