From ff9bec7818dfb37a3ed96ed8087d831d632abfb5 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 11 May 2007 16:02:05 -0700
Subject: [PATCH] --- yaml --- r: 56254 b: refs/heads/master c:
 9ce3075c20d458040138690edfdf6446664ec3ee h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d15847122386..a63c8131bc08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17cf8cc9439262cd90421435e0e8c7ab0af26833
+refs/heads/master: 9ce3075c20d458040138690edfdf6446664ec3ee
diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c
index e6740d1a0824..d9cbd586ae4b 100644
--- a/trunk/drivers/pci/msi.c
+++ b/trunk/drivers/pci/msi.c
@@ -549,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);