diff options
author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2014-11-27 11:19:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-12-02 19:14:29 -0500 |
commit | d97b4f8d690b9fc0e7dd4f4ff5aaea838254e350 (patch) | |
tree | 31e5cb937bee36a831880baabd0c48ed61971b46 /drivers/usb/host/xhci.h | |
parent | 4801d4ea559440b7d63babdac1b1b43a13ac7562 (diff) |
xhci: don't use the same variable for stopped and halted rings current TD
Endpoints halted on errors, and endpoints stopped manually both used
the same ep->stopped_td to store the halted or stopped td. this causes
confusion and possible races.
There is no longer a need to use the ep->stopped_td variable to store
the halted TD. A halted endpoint is handled immediately and we can pass
it to the handling function directly.
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/xhci.h')
-rw-r--r-- | drivers/usb/host/xhci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index d745715a1e2f..053c9ead4f65 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h | |||
@@ -1825,7 +1825,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci, | |||
1825 | unsigned int stream_id, | 1825 | unsigned int stream_id, |
1826 | struct xhci_dequeue_state *deq_state); | 1826 | struct xhci_dequeue_state *deq_state); |
1827 | void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, | 1827 | void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, |
1828 | struct usb_device *udev, unsigned int ep_index); | 1828 | unsigned int ep_index, struct xhci_td *td); |
1829 | void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci, | 1829 | void xhci_queue_config_ep_quirk(struct xhci_hcd *xhci, |
1830 | unsigned int slot_id, unsigned int ep_index, | 1830 | unsigned int slot_id, unsigned int ep_index, |
1831 | struct xhci_dequeue_state *deq_state); | 1831 | struct xhci_dequeue_state *deq_state); |