diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-25 12:30:11 +0800 |
| commit | 5d21882b7a45452960e533f73831423c7f86a799 (patch) | |
| tree | 621fd3e00ad0783eb1be9bd7b6c12142145deb8b /drivers/usb/host/xhci-ring.c | |
| parent | 1fde384c30fb25ff0d7a3e7ed793019479b31e18 (diff) | |
| parent | e5dd309b741e2e4d7e71da61e07249f91c80065e (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-rtlsk-v3.18-16.11-rt
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 c15dbffe660b..cd88034c7a83 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1595,7 +1595,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); |