Commit b72e40b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fix from Borislav Petkov:
 "Remove a bogus warning introduced by the recent PCI MSI irq affinity
  overhaul"

* tag 'irq_urgent_for_v5.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  PCI/MSI: Remove bogus warning in pci_irq_get_affinity()
parents 898b5841 dd7f5a11

drivers/pci/msi/msi.c

+2 −1
Original line number Diff line number Diff line
@@ -1111,7 +1111,8 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) 
	if (!desc)

		return cpu_possible_mask;



	if (WARN_ON_ONCE(!desc->affinity))

	/* MSI[X] interrupts can be allocated without affinity descriptor */

	if (!desc->affinity)

		return NULL;



	/*