From 02fc09ecce803d52fa90b603b7dec34e28ecd7d8 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Jan 2006 08:43:16 -0800
Subject: [PATCH] --- yaml --- r: 16575 b: refs/heads/master c:
 7ed40918a386afc2e14a6d3da563ea6d13686c25 h: refs/heads/master i:   16573:
 f3b686e90b07475d12d7beace56b8f069ba48abd   16571:
 6d0c4e7efc8061d3e83fbc65657b3cac16582c45   16567:
 b513f71885e244136d64453a997d2c0f4cf70dfd   16559:
 34f8349f1a0fae9e79480384f22d9b11532d8c73   16543:
 e8b470725667de185ea52b620589032979fe0e00   16511:
 b9601825edfab5544a99f593f2f26d4ee8aefcc7 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/i386/pci/irq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0d30f88275dd..9d5b220ee447 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b847548663ef1039dd49f0eb4463d001e596bc3
+refs/heads/master: 7ed40918a386afc2e14a6d3da563ea6d13686c25
diff --git a/trunk/arch/i386/pci/irq.c b/trunk/arch/i386/pci/irq.c
index 19e6f4871d1e..ee8e01697d96 100644
--- a/trunk/arch/i386/pci/irq.c
+++ b/trunk/arch/i386/pci/irq.c
@@ -846,7 +846,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
 	 * reported by the device if possible.
 	 */
 	newirq = dev->irq;
-	if (!((1 << newirq) & mask)) {
+	if (newirq && !((1 << newirq) & mask)) {
 		if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0;
 		else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev));
 	}