diff options
author | Sarah Sharp <sarah.a.sharp@linux.intel.com> | 2010-05-06 16:40:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:43 -0400 |
commit | 5e5cf6fc59db2322dfe3ac8e1002f066b06d868f (patch) | |
tree | 4f51dd2a04e7b45969ad80d7065858ed2fdf0f31 /drivers/usb | |
parent | 5bc9661cba04ff3704e704a06367d4fe96d8dd33 (diff) |
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')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 1 | ||||
-rw-r--r-- | drivers/usb/host/xhci.c | 1 |
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, | |||
1166 | 1166 | ||
1167 | ep->stopped_td = NULL; | 1167 | ep->stopped_td = NULL; |
1168 | ep->stopped_trb = NULL; | 1168 | ep->stopped_trb = NULL; |
1169 | ep->stopped_stream = 0; | ||
1169 | 1170 | ||
1170 | xhci_ring_cmd_db(xhci); | 1171 | xhci_ring_cmd_db(xhci); |
1171 | } | 1172 | } |
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, | |||
1457 | } | 1457 | } |
1458 | virt_ep->stopped_td = NULL; | 1458 | virt_ep->stopped_td = NULL; |
1459 | virt_ep->stopped_trb = NULL; | 1459 | virt_ep->stopped_trb = NULL; |
1460 | virt_ep->stopped_stream = 0; | ||
1460 | spin_unlock_irqrestore(&xhci->lock, flags); | 1461 | spin_unlock_irqrestore(&xhci->lock, flags); |
1461 | 1462 | ||
1462 | if (ret) | 1463 | if (ret) |