From 0ab35d883a97650461540fb3472690af7749376b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 11 Jan 2025 07:04:34 +0000 Subject: [PATCH] Revert "xhci: Turn NEC specific quirk for handling Stop Endpoint errors generic" This reverts commit 116b937eb4bb62d0421236124de206742fe8c00b which is commit e21ebe51af688eb98fd6269240212a3c7300deea 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: I684724b541eb4fe3959ef02b8ba32a28f98fbe3b Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-ring.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 78c5089e927f..a2d034e98ed3 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -1178,6 +1178,8 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id, * Keep retrying until the EP starts and stops again, on * chips where this is known to help. Wait for 100ms. */ + if (!(xhci->quirks & XHCI_NEC_HOST)) + break; if (time_is_before_jiffies(ep->stop_time + msecs_to_jiffies(100))) break; fallthrough;