summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorSarah Sharp2010-05-06 22:40:18 +0200
committerGreg Kroah-Hartman2010-05-20 22:21:43 +0200
commit5e5cf6fc59db2322dfe3ac8e1002f066b06d868f (patch)
tree4f51dd2a04e7b45969ad80d7065858ed2fdf0f31 /drivers/usb/host
parentUSB: testusb: testusb compatibility with FunctionFS gadget (diff)
downloadkernel-qcow2-linux-5e5cf6fc59db2322dfe3ac8e1002f066b06d868f.tar.gz
kernel-qcow2-linux-5e5cf6fc59db2322dfe3ac8e1002f066b06d868f.tar.xz
kernel-qcow2-linux-5e5cf6fc59db2322dfe3ac8e1002f066b06d868f.zip
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>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/xhci-ring.c1
-rw-r--r--drivers/usb/host/xhci.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index a67caef265b1..15f02e88f329 100644
--- 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 a9b836d4b290..40e0a0c221b8 100644
--- 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)