From fd15f5f2512beaa6a22a2cff54e46434098345c9 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 22 Mar 2007 21:51:31 +1100
Subject: [PATCH] --- yaml --- r: 53340 b: refs/heads/master c:
 00ba16ab2658afe11d4fdcaf16a331292c44bee6 h: refs/heads/master v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/pci/msi.c | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 87d9d88709cb..fe6e2be4ef74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c31af3987020eeb1facf64d702dcf39e6c7382e6
+refs/heads/master: 00ba16ab2658afe11d4fdcaf16a331292c44bee6
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index 2a119f8d0dc6..91fed543fc84 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -723,27 +723,21 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
 		msi_free_irq(dev, dev->first_msi_irq);
 	}
 	if (dev->msix_enabled) {
-		int irq, head, tail = 0, warning = 0;
+		int irq, head, tail = 0;
 		void __iomem *base = NULL;
 
 		irq = head = dev->first_msi_irq;
 		while (head != tail) {
 			tail = get_irq_msi(irq)->link.tail;
 			base = get_irq_msi(irq)->mask_base;
-			if (irq_has_action(irq))
-				warning = 1;
-			else if (irq != head) /* Release MSI-X irq */
+
+			BUG_ON(irq_has_action(irq));
+
+			if (irq != head) /* Release MSI-X irq */
 				msi_free_irq(dev, irq);
 			irq = tail;
 		}
 		msi_free_irq(dev, irq);
-		if (warning) {
-			iounmap(base);
-			printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
-			       "called without free_irq() on all MSI-X irqs\n",
-			       pci_name(dev));
-			BUG_ON(warning > 0);
-		}
 	}
 }