1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index dd27f73a45fc..50c5003295ca 100644
--- 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];