From 78d3135ddb299c4dc7cdc5f0940c64b86dfd7c7a Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Thu, 6 May 2010 13:40:18 -0700 Subject: [PATCH] --- yaml --- r: 195452 b: refs/heads/master c: 5e5cf6fc59db2322dfe3ac8e1002f066b06d868f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-ring.c | 1 + trunk/drivers/usb/host/xhci.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75be393e594e..4c60c51d6d77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bc9661cba04ff3704e704a06367d4fe96d8dd33 +refs/heads/master: 5e5cf6fc59db2322dfe3ac8e1002f066b06d868f diff --git a/trunk/drivers/usb/host/xhci-ring.c b/trunk/drivers/usb/host/xhci-ring.c index a67caef265b1..15f02e88f329 100644 --- a/trunk/drivers/usb/host/xhci-ring.c +++ b/trunk/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/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c index a9b836d4b290..40e0a0c221b8 100644 --- a/trunk/drivers/usb/host/xhci.c +++ b/trunk/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)