diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 22:59:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 22:59:31 -0400 |
commit | 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1 (patch) | |
tree | eb7b222d73540590d25ea539cd691dd281753102 /drivers/usb/host/ehci-pci.c | |
parent | 50260b69bbec383058875de26dbde28b1a6f8d00 (diff) |
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 7872469ccbb1..145008853966 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) | |||
252 | (void) usb_suspend_device (hcd->self.root_hub); | 252 | (void) usb_suspend_device (hcd->self.root_hub); |
253 | #else | 253 | #else |
254 | usb_lock_device (hcd->self.root_hub); | 254 | usb_lock_device (hcd->self.root_hub); |
255 | (void) ehci_hub_suspend (hcd); | 255 | (void) ehci_bus_suspend (hcd); |
256 | usb_unlock_device (hcd->self.root_hub); | 256 | usb_unlock_device (hcd->self.root_hub); |
257 | #endif | 257 | #endif |
258 | 258 | ||
@@ -285,7 +285,7 @@ static int ehci_pci_resume (struct usb_hcd *hcd) | |||
285 | continue; | 285 | continue; |
286 | if (status & (PORT_SUSPEND | PORT_OWNER)) { | 286 | if (status & (PORT_SUSPEND | PORT_OWNER)) { |
287 | down (&hcd->self.root_hub->serialize); | 287 | down (&hcd->self.root_hub->serialize); |
288 | retval = ehci_hub_resume (hcd); | 288 | retval = ehci_bus_resume (hcd); |
289 | up (&hcd->self.root_hub->serialize); | 289 | up (&hcd->self.root_hub->serialize); |
290 | break; | 290 | break; |
291 | } | 291 | } |