1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 2e370fea9590..3cac2ff8b50a 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -353,11 +353,7 @@ void xhci_event_ring_work(unsigned long arg)
                 if (!xhci->devs[i])
                         continue;
                 for (j = 0; j < 31; ++j) {
-                        struct xhci_ring *ring = xhci->devs[i]->eps[j].ring;
-                        if (!ring)
-                                continue;
-                        xhci_dbg(xhci, "Dev %d endpoint ring %d:\n", i, j);
-                        xhci_debug_segment(xhci, ring->deq_seg);
+                        xhci_dbg_ep_rings(xhci, i, j, &xhci->devs[i]->eps[j]);
                 }
         }
 
@@ -839,7 +835,12 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
         xhci_debug_ring(xhci, xhci->event_ring);
         ep_index = xhci_get_endpoint_index(&urb->ep->desc);
         ep = &xhci->devs[urb->dev->slot_id]->eps[ep_index];
-        ep_ring = ep->ring;
+        ep_ring = xhci_urb_to_transfer_ring(xhci, urb);
+        if (!ep_ring) {
+                ret = -EINVAL;
+                goto done;
+        }
+
         xhci_dbg(xhci, "Endpoint ring:\n");
         xhci_debug_ring(xhci, ep_ring);
         td = (struct xhci_td *) urb->hcpriv;
@@ -1383,7 +1384,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_td,
+                        ep_index, ep->stopped_stream, ep->stopped_td,
                         &deq_state);
 
         /* HW with the reset endpoint quirk will use the saved dequeue state to
@@ -1392,10 +1393,12 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
         if (!(xhci->quirks & XHCI_RESET_EP_QUIRK)) {
                 xhci_dbg(xhci, "Queueing new dequeue state\n");
                 xhci_queue_new_dequeue_state(xhci, udev->slot_id,
-                                ep_index, &deq_state);
+                                ep_index, ep->stopped_stream, &deq_state);
         } else {
                 /* Better hope no one uses the input context between now and the
                  * reset endpoint completion!
+                 * XXX: No idea how this hardware will react when stream rings
+                 * are enabled.
                  */
                 xhci_dbg(xhci, "Setting up input context for "
                                 "configure endpoint command\n");