diff options
-rw-r--r-- | drivers/usb/core/hub.c | 2 | ||||
-rw-r--r-- | drivers/usb/host/ehci-pci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 9660a8909b7c..256d9f698715 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1674,7 +1674,7 @@ int usb_suspend_device(struct usb_device *udev) | |||
1674 | return 0; | 1674 | return 0; |
1675 | #endif | 1675 | #endif |
1676 | } | 1676 | } |
1677 | 1677 | EXPORT_SYMBOL_GPL(usb_suspend_device); | |
1678 | 1678 | ||
1679 | /* | 1679 | /* |
1680 | * If the USB "suspend" state is in use (rather than "global suspend"), | 1680 | * If the USB "suspend" state is in use (rather than "global suspend"), |
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 | } |