From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sat, 29 Oct 2005 02:59:31 +0000 (-0700)
Subject: USB: fix up some odd parts due to partial merges
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1;p=deliverable%2Flinux.git

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 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)
 	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 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)
 	(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;
 		}