diff options
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 11 | ||||
| -rw-r--r-- | drivers/usb/host/xhci.c | 13 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 771a6da9caea..521c1816a26a 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -917,17 +917,6 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg) | |||
| 917 | spin_lock_irqsave(&xhci->lock, flags); | 917 | spin_lock_irqsave(&xhci->lock, flags); |
| 918 | 918 | ||
| 919 | ep->stop_cmds_pending--; | 919 | ep->stop_cmds_pending--; |
| 920 | if (xhci->xhc_state & XHCI_STATE_REMOVING) { | ||
| 921 | spin_unlock_irqrestore(&xhci->lock, flags); | ||
| 922 | return; | ||
| 923 | } | ||
| 924 | if (xhci->xhc_state & XHCI_STATE_DYING) { | ||
| 925 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, | ||
| 926 | "Stop EP timer ran, but another timer marked " | ||
| 927 | "xHCI as DYING, exiting."); | ||
| 928 | spin_unlock_irqrestore(&xhci->lock, flags); | ||
| 929 | return; | ||
| 930 | } | ||
| 931 | if (!(ep->stop_cmds_pending == 0 && (ep->ep_state & EP_HALT_PENDING))) { | 920 | if (!(ep->stop_cmds_pending == 0 && (ep->ep_state & EP_HALT_PENDING))) { |
| 932 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, | 921 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, |
| 933 | "Stop EP timer ran, but no command pending, " | 922 | "Stop EP timer ran, but no command pending, " |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ad0624386950..34e23c7d7797 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -1529,19 +1529,6 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) | |||
| 1529 | xhci_urb_free_priv(urb_priv); | 1529 | xhci_urb_free_priv(urb_priv); |
| 1530 | return ret; | 1530 | return ret; |
| 1531 | } | 1531 | } |
| 1532 | if ((xhci->xhc_state & XHCI_STATE_DYING) || | ||
| 1533 | (xhci->xhc_state & XHCI_STATE_HALTED)) { | ||
| 1534 | xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, | ||
| 1535 | "Ep 0x%x: URB %p to be canceled on " | ||
| 1536 | "non-responsive xHCI host.", | ||
| 1537 | urb->ep->desc.bEndpointAddress, urb); | ||
| 1538 | /* Let the stop endpoint command watchdog timer (which set this | ||
| 1539 | * state) finish cleaning up the endpoint TD lists. We must | ||
| 1540 | * have caught it in the middle of dropping a lock and giving | ||
| 1541 | * back an URB. | ||
| 1542 | */ | ||
| 1543 | goto done; | ||
| 1544 | } | ||
| 1545 | 1532 | ||
| 1546 | ep_index = xhci_get_endpoint_index(&urb->ep->desc); | 1533 | ep_index = xhci_get_endpoint_index(&urb->ep->desc); |
| 1547 | ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index]; | 1534 | ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index]; |