diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 21:33:17 -0400 |
| commit | 1aaaa9acaea1dd2878d6c92b45e4c117ef425baf (patch) | |
| tree | f1fe5948a6da8850862ae751da0b62dac351517f /drivers/usb/host/ehci-hcd.c | |
| parent | 73577d61799e8d8bb7d69a9acdc54923e5998138 (diff) | |
| parent | fa8410b355251fd30341662a40ac6b22d3e38468 (diff) | |
| download | linux-stable-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.tar.gz linux-stable-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.tar.bz2 linux-stable-1aaaa9acaea1dd2878d6c92b45e4c117ef425baf.zip | |
Merge 4.8-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index a962b89b65a6..1e5f529d51a2 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -332,11 +332,11 @@ static void ehci_turn_off_all_ports(struct ehci_hcd *ehci) int port = HCS_N_PORTS(ehci->hcs_params); while (port--) { - ehci_writel(ehci, PORT_RWC_BITS, - &ehci->regs->port_status[port]); spin_unlock_irq(&ehci->lock); ehci_port_power(ehci, port, false); spin_lock_irq(&ehci->lock); + ehci_writel(ehci, PORT_RWC_BITS, + &ehci->regs->port_status[port]); } } |