diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 04:20:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 04:20:27 +0100 |
| commit | 252ca494ac75f0dc47469f130d6dc67ed14081f4 (patch) | |
| tree | 159e9931af199f8acf50f9982f281ee69ceb7cbf /drivers/usb/host/xhci-ring.c | |
| parent | usb: ehci: ohci: fix bool assignments (diff) | |
| parent | Linux 4.4-rc5 (diff) | |
| download | linux-252ca494ac75f0dc47469f130d6dc67ed14081f4.tar.xz linux-252ca494ac75f0dc47469f130d6dc67ed14081f4.zip | |
Merge 4.4-rc5 into usb-next as we want those fixes here for testing
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 8fab75863f1a..f1c21c40b4a6 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1584,7 +1584,8 @@ static void handle_port_status(struct xhci_hcd *xhci, */ bogus_port_status = true; goto cleanup; - } else { + } else if (!test_bit(faked_port_index, + &bus_state->resuming_ports)) { xhci_dbg(xhci, "resume HS port %d\n", port_id); bus_state->resume_done[faked_port_index] = jiffies + msecs_to_jiffies(USB_RESUME_TIMEOUT); |