diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-09 14:09:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-09 14:09:32 +0100 |
| commit | f0af7245f1725fdc39b32b59c20500448437ddbe (patch) | |
| tree | d12fd927f546eac8b6c5697bb5c60f9a5e48bece /arch/arm/mach-footbridge/cats-pci.c | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| parent | f47c32f3ae604669c3af0b7a07917270a235bd84 (diff) | |
Merge branch 'for-rmk' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch/arm/mach-footbridge/cats-pci.c')
| -rw-r--r-- | arch/arm/mach-footbridge/cats-pci.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c index 35eb232a649..ae3e1c8c758 100644 --- a/arch/arm/mach-footbridge/cats-pci.c +++ b/arch/arm/mach-footbridge/cats-pci.c @@ -18,6 +18,9 @@ static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 }; static int __init cats_map_irq(struct pci_dev *dev, u8 slot, u8 pin) { + if (dev->irq >= 255) + return -1; /* not a valid interrupt. */ + if (dev->irq >= 128) return dev->irq & 0x1f; |