diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/i386/pci/irq.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/i386/pci/irq.c')
| -rw-r--r-- | arch/i386/pci/irq.c | 2 |
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) | |||
| 846 | * reported by the device if possible. | 846 | * reported by the device if possible. |
| 847 | */ | 847 | */ |
| 848 | newirq = dev->irq; | 848 | newirq = dev->irq; |
| 849 | if (!((1 << newirq) & mask)) { | 849 | if (newirq && !((1 << newirq) & mask)) { |
| 850 | if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; | 850 | if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0; |
| 851 | else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev)); | 851 | else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev)); |
| 852 | } | 852 | } |