Commit 4303fc6f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: fix up some odd parts due to partial merges

Thanks to Andrew for doing the hard work on this.
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 50260b69
......@@ -1674,7 +1674,7 @@ int usb_suspend_device(struct usb_device *udev)
return 0;
* If the USB "suspend" state is in use (rather than "global suspend"),
......@@ -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);
usb_lock_device (hcd->self.root_hub);
(void) ehci_hub_suspend (hcd);
(void) ehci_bus_suspend (hcd);
usb_unlock_device (hcd->self.root_hub);
......@@ -285,7 +285,7 @@ static int ehci_pci_resume (struct usb_hcd *hcd)
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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment