Commit db5ba864 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/msi' into next 

* pci/msi:
  PCI/MSI: Check for NULL affinity mask in pci_irq_get_affinity()
parents c1f2e80c d1d111e0

drivers/pci/msi.c

+2 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,8 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) 
	} else if (dev->msi_enabled) {

		struct msi_desc *entry = first_pci_msi_entry(dev);



		if (WARN_ON_ONCE(!entry || nr >= entry->nvec_used))

		if (WARN_ON_ONCE(!entry || !entry->affinity ||

				 nr >= entry->nvec_used))

			return NULL;



		return &entry->affinity[nr];

CRA Git | Maintained and supported by SUSTech CRA and CCSE