diff options
author | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2017-01-16 16:57:54 +0100 |
commit | 11cca3d12f03c670a6dd14004d40580918898760 (patch) | |
tree | 495a745eaf5c44d08f8b1fb01b61733dc0e78c70 /drivers/usb/host/xhci-ring.c | |
parent | serial: 8250: Add new port type for TI DA8xx/66AK2x (diff) | |
parent | Linux 4.10-rc4 (diff) | |
download | kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.gz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.tar.xz kernel-qcow2-linux-11cca3d12f03c670a6dd14004d40580918898760.zip |
Merge 4.10-rc4 into tty-next
We want the serial/tty fixes in here as well to build on top of.
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 | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 25f522b09dd9..e32029a31ca4 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -913,17 +913,6 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg) spin_lock_irqsave(&xhci->lock, flags); ep->stop_cmds_pending--; - if (xhci->xhc_state & XHCI_STATE_REMOVING) { - spin_unlock_irqrestore(&xhci->lock, flags); - return; - } - if (xhci->xhc_state & XHCI_STATE_DYING) { - xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, - "Stop EP timer ran, but another timer marked " - "xHCI as DYING, exiting."); - spin_unlock_irqrestore(&xhci->lock, flags); - return; - } if (!(ep->stop_cmds_pending == 0 && (ep->ep_state & EP_HALT_PENDING))) { xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, "Stop EP timer ran, but no command pending, " |