From afca077cf3fadd6721fa95869f08daafa472df83 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 21 May 2025 10:09:10 +0000 Subject: [PATCH] Revert "usb: xhci: Fix Short Packet handling rework ignoring errors" This reverts commit 1b7647efade7c3143b830b077f7440f6c075ad21 which is commit 9e3a28793d2fde7a709e814d2504652eaba6ae98 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I7560c394afc2360914986129b80977d2fa5abbf7 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index d0e04259d435..787af1e3ca95 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -2927,7 +2927,7 @@ static int handle_tx_event(struct xhci_hcd *xhci, if (xhci_spurious_success_tx_event(xhci, ep_ring)) { xhci_dbg(xhci, "Spurious event dma %pad, comp_code %u after %u\n", &ep_trb_dma, trb_comp_code, ep_ring->old_trb_comp_code); - ep_ring->old_trb_comp_code = 0; + ep_ring->old_trb_comp_code = trb_comp_code; return 0; }