unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

USB: fix up some odd parts due to partial merges

Browse source 
Thanks to Andrew for doing the hard work on this.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2005-10-28 19:59:31 -07:00
parent 50260b69bb
commit 4303fc6f05
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/core/hub.c
View file

@ -1674,7 +1674,7 @@ int usb_suspend_device(struct usb_device *udev)
return 0; return 0;
#endif #endif
} }
EXPORT_SYMBOL_GPL(usb_suspend_device);
/* /*
* If the USB "suspend" state is in use (rather than "global suspend"), * If the USB "suspend" state is in use (rather than "global suspend"),

4
drivers/usb/host/ehci-pci.c
View file

@ -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); (void) usb_suspend_device (hcd->self.root_hub);
#else #else
usb_lock_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); usb_unlock_device (hcd->self.root_hub);
#endif #endif
@ -285,7 +285,7 @@ static int ehci_pci_resume (struct usb_hcd *hcd)
continue; continue;
if (status & (PORT_SUSPEND | PORT_OWNER)) { if (status & (PORT_SUSPEND | PORT_OWNER)) {
down (&hcd->self.root_hub->serialize); down (&hcd->self.root_hub->serialize);
retval = ehci_hub_resume (hcd); retval = ehci_bus_resume (hcd);
up (&hcd->self.root_hub->serialize); up (&hcd->self.root_hub->serialize);
break; break;
} }