Merge tag 'libnvdimm-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdim...

[mirror_ubuntu-bionic-kernel.git] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index dd27f73a45fc1f141c54f708e6ebd739112abdcc..50c5003295ca535036b056d7855caf0c96473f13 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1302,7 +1302,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];