From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 948554f1bb16e15b90006c109c3a558c66d4c4ac which is commit 66cb618bf0bb82859875b00eeffaf223557cb416 upstream. In backporting it to stable kernels, it causes a severe regression on many systems, so revert it for now. Reported-by: Tim Lewis <elatllat@xxxxxxxxx> Link: https://lore.kernel.org/r/CA+3zgmvct7BWib9A7O1ykUf=0nZpdbdpXBdPWOCqfPuyCT3fug@xxxxxxxxxxxxxx Reported-by: <matthias@xxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/bug-219039-208809@xxxxxxxxxxxxxxxxxxxxxxxxx/ Cc: Niklas Neronin <niklas.neronin@xxxxxxxxxxxxxxx> Cc: Mathias Nyman <mathias.nyman@xxxxxxxxxxxxxxx> Cc: MichaÅ? Pecio <michal.pecio@xxxxxxxxx> Cc: <ZeroBeat@xxxxxx> Cc: Salvatore Bonaccorso <carnil@xxxxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/host/xhci-ring.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2631,17 +2631,16 @@ static int handle_tx_event(struct xhci_h else xhci_handle_halted_endpoint(xhci, ep, 0, NULL, EP_SOFT_RESET); - break; + goto cleanup; case COMP_RING_UNDERRUN: case COMP_RING_OVERRUN: case COMP_STOPPED_LENGTH_INVALID: - break; + goto cleanup; default: xhci_err(xhci, "ERROR Transfer event for unknown stream ring slot %u ep %u\n", slot_id, ep_index); goto err_out; } - return 0; } /* Count current td numbers if ep->skip is set */ Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-6.1/revert-usb-xhci-prevent-potential-failure-in-handle_tx_event-for-transfer-events-without-trb.patch
