Skip to content

Commit

Permalink
USB: fix up some odd parts due to partial merges
Browse files Browse the repository at this point in the history 
Thanks to Andrew for doing the hard work on this.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Oct 29, 2005
1 parent 50260b6 commit 4303fc6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/usb/core/hub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/host/ehci-pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 4303fc6

Please sign in to comment.