diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:59:31 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 19:59:31 -0700 |
commit | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (patch) | |
tree | eb7b222d73540590d25ea539cd691dd281753102 /drivers/usb/host/ehci-pci.c | |
parent | 50260b69bbec383058875de26dbde28b1a6f8d00 (diff) | |
download | op-kernel-dev-4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1.zip op-kernel-dev-4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1.tar.gz |
USB: fix up some odd parts due to partial merges
Thanks to Andrew for doing the hard work on this.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-pci.c')
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c index 7872469..1450088 100644 --- a/drivers/usb/host/ehci-pci.c +++ b/drivers/usb/host/ehci-pci.c @@ -252,7 +252,7 @@ static int ehci_pci_suspend (struct usb_hcd *hcd, pm_message_t message) (void) usb_suspend_device (hcd->self.root_hub); #else usb_lock_device (hcd->self.root_hub); - (void) ehci_hub_suspend (hcd); + (void) ehci_bus_suspend (hcd); usb_unlock_device (hcd->self.root_hub); #endif @@ -285,7 +285,7 @@ static int ehci_pci_resume (struct usb_hcd *hcd) continue; if (status & (PORT_SUSPEND | PORT_OWNER)) { down (&hcd->self.root_hub->serialize); - retval = ehci_hub_resume (hcd); + retval = ehci_bus_resume (hcd); up (&hcd->self.root_hub->serialize); break; } |