From: Linus Torvalds Date: Fri, 6 Jan 2006 16:43:16 +0000 (-0800) Subject: x86: remove bogus 'pci=usepirqmask' suggestion when no irq is defined X-Git-Tag: v2.6.16-rc1~936^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7ed40918a386afc2e14a6d3da563ea6d13686c25;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 19e6f4871d1..ee8e01697d9 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)); }