Skip to content

Commit 741b41b

Browse files
Epicuriusgregkh
authored andcommitted
usb: xhci: fix duplicate stall handling in handle_tx_event()
Stall handling is managed in the 'process_*' functions, which are called right before the 'goto' stall handling code snippet. Thus, there should be a return after the 'process_*' functions. Otherwise, the stall code may run twice. Fixes: 1b349f2 ("usb: xhci: add 'goto' for halted endpoint check in handle_tx_event()") Reported-by: Michal Pecio <michal.pecio@gmail.com> Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20240809124408.505786-3-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent dcdb52d commit 741b41b

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/usb/host/xhci-ring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2910,6 +2910,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
29102910
process_isoc_td(xhci, ep, ep_ring, td, ep_trb, event);
29112911
else
29122912
process_bulk_intr_td(xhci, ep, ep_ring, td, ep_trb, event);
2913+
return 0;
29132914

29142915
check_endpoint_halted:
29152916
if (xhci_halted_host_endpoint(ep_ctx, trb_comp_code))

0 commit comments

Comments
 (0)