diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-07-29 18:13:24 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-07-29 18:13:24 -0400 |
| commit | 4b979e4c611ce750d32b51737f837b485f43c69b (patch) | |
| tree | 3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0 /drivers/usb/host/xhci-ring.c | |
| parent | 1559f3b8d0527e24219149c95b3de5e7b2924828 (diff) | |
| parent | cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f (diff) | |
Merge branch 'linus' into irq/core
Pull in upstream fixes before applying conflicting changes
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 94416ff70810..6a8fc52aed58 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, | |||
| 1546 | usb_hcd_resume_root_hub(hcd); | 1546 | usb_hcd_resume_root_hub(hcd); |
| 1547 | } | 1547 | } |
| 1548 | 1548 | ||
| 1549 | if (hcd->speed == HCD_USB3 && (temp & PORT_PLS_MASK) == XDEV_INACTIVE) | ||
| 1550 | bus_state->port_remote_wakeup &= ~(1 << faked_port_index); | ||
| 1551 | |||
| 1549 | if ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) == XDEV_RESUME) { | 1552 | if ((temp & PORT_PLC) && (temp & PORT_PLS_MASK) == XDEV_RESUME) { |
| 1550 | xhci_dbg(xhci, "port resume event for port %d\n", port_id); | 1553 | xhci_dbg(xhci, "port resume event for port %d\n", port_id); |
| 1551 | 1554 | ||