Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 10841
b: refs/heads/master
c: 4303fc6
h: refs/heads/master
i:
  10839: 62d8910
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Oct 29, 2005
1 parent 8f63d4e commit 2aac86d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 50260b69bbec383058875de26dbde28b1a6f8d00
refs/heads/master: 4303fc6f055cf1a7ec63c3c3fd777b91b7d576f1
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/hub.c
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 trunk/drivers/usb/host/ehci-pci.c
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 2aac86d

Please sign in to comment.