2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 2c1075213bec..aca7578b05e5 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -81,7 +81,10 @@ void default_teardown_msi_irqs(struct pci_dev *dev)
                 int i, nvec;
                 if (entry->irq == 0)
                         continue;
-                nvec = 1 << entry->msi_attrib.multiple;
+                if (entry->nvec_used)
+                        nvec = entry->nvec_used;
+                else
+                        nvec = 1 << entry->msi_attrib.multiple;
                 for (i = 0; i < nvec; i++)
                         arch_teardown_msi_irq(entry->irq + i);
         }
@@ -336,7 +339,10 @@ static void free_msi_irqs(struct pci_dev *dev)
                 int i, nvec;
                 if (!entry->irq)
                         continue;
-                nvec = 1 << entry->msi_attrib.multiple;
+                if (entry->nvec_used)
+                        nvec = entry->nvec_used;
+                else
+                        nvec = 1 << entry->msi_attrib.multiple;
 #ifdef CONFIG_GENERIC_HARDIRQS
                 for (i = 0; i < nvec; i++)
                         BUG_ON(irq_has_action(entry->irq + i));
diff --git a/include/linux/msi.h b/include/linux/msi.h
index 20c2d6dd5d25..ee66f3a12fb6 100644
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -35,6 +35,7 @@ struct msi_desc {
 
         u32 masked;                     /* mask bits */
         unsigned int irq;
+        unsigned int nvec_used;         /* number of messages */
         struct list_head list;
 
         union {