2 files changed, 0 insertions, 24 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, "
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 0c8deb9ed42d..9a0ec116654a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1534,19 +1534,6 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                 xhci_urb_free_priv(urb_priv);
                 return ret;
         }
-        if ((xhci->xhc_state & XHCI_STATE_DYING) ||
-                        (xhci->xhc_state & XHCI_STATE_HALTED)) {
-                xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,
-                                "Ep 0x%x: URB %p to be canceled on "
-                                "non-responsive xHCI host.",
-                                urb->ep->desc.bEndpointAddress, urb);
-                /* Let the stop endpoint command watchdog timer (which set this
-                 * state) finish cleaning up the endpoint TD lists.  We must
-                 * have caught it in the middle of dropping a lock and giving
-                 * back an URB.
-                 */
-                goto done;
-        }
 
         ep_index = xhci_get_endpoint_index(&urb->ep->desc);
         ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index];