summaryrefslogtreecommitdiffstats
path: root/arch/i386/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:43:16 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:43:16 -0800
commit7ed40918a386afc2e14a6d3da563ea6d13686c25 (patch)
treee180ba59fa65290a12a731aaf304d2aa840f3ffb /arch/i386/pci
parent9b847548663ef1039dd49f0eb4463d001e596bc3 (diff)
downloadlinux-stable-7ed40918a386afc2e14a6d3da563ea6d13686c25.tar.gz
linux-stable-7ed40918a386afc2e14a6d3da563ea6d13686c25.tar.bz2
linux-stable-7ed40918a386afc2e14a6d3da563ea6d13686c25.zip
x86: remove bogus 'pci=usepirqmask' suggestion when no irq is defined
This was harmless, but for the case of a device that had no irq pre-defined we would incorrectly suggest that "usepirqmask" might make a difference. It never would, and the message was just confusing people. Reported in the dmesg of Etienne Lorrain. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/pci')
-rw-r--r--arch/i386/pci/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 19e6f4871d1e..ee8e01697d96 100644
--- a/arch/i386/pci/irq.c
+++ b/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));
}