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>
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9660a89..256d9f6 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1674,7 +1674,7 @@
return 0;
#endif
}
-
+EXPORT_SYMBOL_GPL(usb_suspend_device);
/*
* 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 7872469..1450088 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -252,7 +252,7 @@
(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 @@
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;
}
