---

yaml --- r: 53339 b: refs/heads/master c: c31af39 h: refs/heads/master i: 53337: 86b6a78 53335: d1f38fb v: v3
git-mirror · May 3, 2007 · 4f10009 · 4f10009
1 parent aa7d884
commit 4f10009
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54bc6c0b0edd164fc2ea85b3964736c182f6bd5d
+refs/heads/master: c31af3987020eeb1facf64d702dcf39e6c7382e6
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
@@ -719,13 +719,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
  		return;
 
 	if (dev->msi_enabled) {
-		if (irq_has_action(dev->first_msi_irq)) {
-			printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-			       "called without free_irq() on MSI irq %d\n",
-			       pci_name(dev), dev->first_msi_irq);
-			BUG_ON(irq_has_action(dev->first_msi_irq));
-		} else /* Release MSI irq assigned to this device */
-			msi_free_irq(dev, dev->first_msi_irq);
+		BUG_ON(irq_has_action(dev->first_msi_irq));
+		msi_free_irq(dev, dev->first_msi_irq);
 	}
 	if (dev->msix_enabled) {
 		int irq, head, tail = 0, warning = 0;