From: Dom Cobley <popcornmix@gmail.com>
Date: Mon, 9 May 2022 15:59:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
X-Git-Tag: accepted/tizen/unified/20230118.172025~618
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f5035e6c8927aa53d478ba1aedffed26b62ce218;p=platform%2Fkernel%2Flinux-rpi.git

Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
---

f5035e6c8927aa53d478ba1aedffed26b62ce218
diff --cc drivers/usb/host/xhci-ring.c
index 0c4bef2,f970799..6b4cb26
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@@ -3156,9 -3138,10 +3156,10 @@@ irqreturn_t xhci_irq(struct usb_hcd *hc
  	 * that clears the EHB.
  	 */
  	while (xhci_handle_event(xhci) > 0) {
 -		if (event_loop++ < TRBS_PER_SEGMENT / 2)
 +		if (event_loop++ < xhci->event_ring->trbs_per_seg / 2)
  			continue;
  		xhci_update_erst_dequeue(xhci, event_ring_deq);
+ 		event_ring_deq = xhci->event_ring->dequeue;
  
  		/* ring is half-full, force isoc trbs to interrupt more often */
  		if (xhci->isoc_bei_interval > AVOID_BEI_INTERVAL_MIN)