1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index cf3413116aff..01fcbb5eb06e 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;
@@ -4009,6 +4009,7 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
         slot_ctx = xhci_get_slot_ctx(xhci, command->in_ctx);
         slot_ctx->dev_info2 &= cpu_to_le32(~((u32) MAX_EXIT));
         slot_ctx->dev_info2 |= cpu_to_le32(max_exit_latency);
+        slot_ctx->dev_state = 0;
 
         xhci_dbg_trace(xhci, trace_xhci_dbg_context_change,
                         "Set up evaluate context for LPM MEL change.");