aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/pci/msi.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index db452319be90..2a119f8d0dc6 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -719,13 +719,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
719 return; 719 return;
720 720
721 if (dev->msi_enabled) { 721 if (dev->msi_enabled) {
722 if (irq_has_action(dev->first_msi_irq)) { 722 BUG_ON(irq_has_action(dev->first_msi_irq));
723 printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() " 723 msi_free_irq(dev, dev->first_msi_irq);
724 "called without free_irq() on MSI irq %d\n",
725 pci_name(dev), dev->first_msi_irq);
726 BUG_ON(irq_has_action(dev->first_msi_irq));
727 } else /* Release MSI irq assigned to this device */
728 msi_free_irq(dev, dev->first_msi_irq);
729 } 724 }
730 if (dev->msix_enabled) { 725 if (dev->msix_enabled) {
731 int irq, head, tail = 0, warning = 0; 726 int irq, head, tail = 0, warning = 0;