3 files changed, 6 insertions, 10 deletions

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 5f609325ec7b..e692e769c50c 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -716,9 +716,7 @@ remove_finished_td:
                 ring_doorbell_for_active_rings(xhci, slot_id, ep_index);
         }
 
-        /* Clear stopped_td if endpoint is not halted */
-        if (!(ep->ep_state & EP_HALTED))
-                ep->stopped_td = NULL;
+        ep->stopped_td = NULL;
 
         /*
          * Drop the lock and complete the URBs in the cancelled TD list.
@@ -1732,13 +1730,11 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
                 return;
 
         ep->ep_state |= EP_HALTED;
-        ep->stopped_td = td;
         ep->stopped_stream = stream_id;
 
         xhci_queue_reset_ep(xhci, command, slot_id, ep_index);
-        xhci_cleanup_stalled_ring(xhci, td->urb->dev, ep_index);
+        xhci_cleanup_stalled_ring(xhci, ep_index, td);
 
-        ep->stopped_td = NULL;
         ep->stopped_stream = 0;
 
         xhci_ring_cmd_db(xhci);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 0ea7e12d4765..5be1bff9b4eb 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -2912,10 +2912,11 @@ static void xhci_setup_input_ctx_for_quirk(struct xhci_hcd *xhci,
 }
 
 void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
-                struct usb_device *udev, unsigned int ep_index)
+                        unsigned int ep_index, struct xhci_td *td)
 {
         struct xhci_dequeue_state deq_state;
         struct xhci_virt_ep *ep;
+        struct usb_device *udev = td->urb->dev;
 
         xhci_dbg_trace(xhci, trace_xhci_dbg_reset_ep,
                         "Cleaning up stalled endpoint ring");
@@ -2924,8 +2925,7 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
          * or it will attempt to resend it on the next doorbell ring.
          */
         xhci_find_new_dequeue_state(xhci, udev->slot_id,
-                        ep_index, ep->stopped_stream, ep->stopped_td,
-                        &deq_state);
+                        ep_index, ep->stopped_stream, td, &deq_state);
 
         if (!deq_state.new_deq_ptr || !deq_state.new_deq_seg)
                 return;
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index d745715a1e2f..053c9ead4f65 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1825,7 +1825,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
                 unsigned int stream_id,
                 struct xhci_dequeue_state *deq_state);
 void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
-                struct usb_device *udev, unsigned int ep_index);
+                unsigned int ep_index, struct xhci_td *td);
 void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci,
                 unsigned int slot_id, unsigned int ep_index,
                 struct xhci_dequeue_state *deq_state);