USB: xhci: Set stream ID to 0 after cleaning up stalls.

After using state stored in xhci_virt_ep to clean up a stalled endpoint,
be sure to set the stalled stream ID back to 0.

Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index a67caef265b1e0b710d18be570bab0416c89817e..15f02e88f3292f53d634533c77b8d47ccc5f4d37 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1166,6 +1166,7 @@ static void xhci_cleanup_halted_endpoint(struct xhci_hcd *xhci,
 
        ep->stopped_td = NULL;
        ep->stopped_trb = 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 a9b836d4b290af3e21fabe82d5c16d121e461952..40e0a0c221b82cddfbcb6875f87cdaafcf390c16 100644 (file)
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1457,6 +1457,7 @@ void xhci_endpoint_reset(struct usb_hcd *hcd,
        }
        virt_ep->stopped_td = NULL;
        virt_ep->stopped_trb = NULL;
+       virt_ep->stopped_stream = 0;
        spin_unlock_irqrestore(&xhci->lock, flags);
 
        if (ret)