Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[~andy/linux] / drivers / pci / msi.c

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 9e1321d0d5e683d281c9e10fc42c826c38e8f4cf..d9cbd586ae4bc282815a6b7aad16ddb3ecb523df 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -12,7 +12,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-#include <linux/smp_lock.h>
 #include <linux/pci.h>
 #include <linux/proc_fs.h>
 #include <linux/msi.h>
@@ -550,8 +549,10 @@ static int msi_free_irqs(struct pci_dev* dev)
 {
        struct msi_desc *entry, *tmp;
 
-       list_for_each_entry(entry, &dev->msi_list, list)
-               BUG_ON(irq_has_action(entry->irq));
+       list_for_each_entry(entry, &dev->msi_list, list) {
+               if (entry->irq)
+                       BUG_ON(irq_has_action(entry->irq));
+       }
 
        arch_teardown_msi_irqs(dev);