Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
authorDom Cobley <popcornmix@gmail.com>
Mon, 9 May 2022 15:59:08 +0000 (16:59 +0100)
committerDom Cobley <popcornmix@gmail.com>
Mon, 9 May 2022 15:59:08 +0000 (16:59 +0100)
1  2 
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/tty/serial/amba-pl011.c
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c

Simple merge
Simple merge
@@@ -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)
Simple merge