diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-08 12:03:11 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-08 12:03:11 -0800 |
| commit | ceb675a9e25c0c11f76f8e72a862caf08d3934d3 (patch) | |
| tree | 6c79ad3468e7923f5da9f9ccd6678e0e4e3cd874 /drivers/usb/host/uhci-hub.c | |
| parent | 9662ced3527f5994e83957cf40765ed126abe97f (diff) | |
| parent | 200e0d994d9d1919b28c87f1a5fb99a8e13b8a0f (diff) | |
| download | op-kernel-dev-ceb675a9e25c0c11f76f8e72a862caf08d3934d3.zip op-kernel-dev-ceb675a9e25c0c11f76f8e72a862caf08d3934d3.tar.gz | |
Merge usb-linus branch into usb-next
This pulls in a bunch of fixes that are in Linus's tree because we need them
here for testing and development.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
| -rw-r--r-- | drivers/usb/host/uhci-hub.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index 533b864..f87bee6 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c @@ -116,6 +116,7 @@ static void uhci_finish_suspend(struct uhci_hcd *uhci, int port, } } clear_bit(port, &uhci->resuming_ports); + usb_hcd_end_port_resume(&uhci_to_hcd(uhci)->self, port); } /* Wait for the UHCI controller in HP's iLO2 server management chip. @@ -167,6 +168,8 @@ static void uhci_check_ports(struct uhci_hcd *uhci) set_bit(port, &uhci->resuming_ports); uhci->ports_timeout = jiffies + msecs_to_jiffies(25); + usb_hcd_start_port_resume( + &uhci_to_hcd(uhci)->self, port); /* Make sure we see the port again * after the resuming period is over. */ |
