diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:38 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:38 +0800 |
| commit | 0a2aefa1f71da3bb10634918c68f6fb0068c1052 (patch) | |
| tree | 4195c8a10f3ef77a6d9bbce99569b79542572ed0 /drivers/usb/host/xhci-ring.c | |
| parent | 575245c4212d0ee74aa3f4d5f0ca2b1a6ff5e5c9 (diff) | |
| parent | 9ca365c0c8bdd8552ec064f0e696600cf7ea66dd (diff) | |
Merge tag 'v4.1.35' into linux-linaro-lsk-v4.1lsk-v4.1-16.11
This is the 4.1.35 stable release
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 6a2911743829..2d8e77ff7821 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1605,7 +1605,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); |