diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-14 09:32:40 -0700 |
| commit | c7101dcf349bdb3fab576942113fb39a5c0c3ce4 (patch) | |
| tree | 007998dcbdb919dc038f0ae44422ea8cb353a1d5 /drivers/usb/host/xhci-ring.c | |
| parent | 2298563cff64db252affbe2eb5e979d59b4c0187 (diff) | |
| parent | b7be2a1de3f5c0827a4f8ccb6a18342d9d4dc446 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rt
Diffstat (limited to 'drivers/usb/host/xhci-ring.c')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 7d34cbfaf373..d095677a0702 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1546,6 +1546,9 @@ static void handle_port_status(struct xhci_hcd *xhci, usb_hcd_resume_root_hub(hcd); } + if (hcd->speed == HCD_USB3 && (temp & PORT_PLS_MASK) == XDEV_INACTIVE) + bus_state->port_remote_wakeup &= ~(1 << faked_port_index); + if ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) == XDEV_RESUME) { xhci_dbg(xhci, "port resume event for port %d\n", port_id); |