summaryrefslogtreecommitdiff
path: root/arch/arm/mach-footbridge/cats-pci.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-24 12:31:34 +0400
committerIngo Molnar <mingo@elte.hu>2008-09-24 12:31:34 +0400
commite6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch)
tree77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /arch/arm/mach-footbridge/cats-pci.c
parentd4738792fb86600b6cb7220459d9c47e819b3580 (diff)
parent72d31053f62c4bc464c2783974926969614a8649 (diff)
downloadlinux-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.tar.xz
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'arch/arm/mach-footbridge/cats-pci.c')
-rw-r--r--arch/arm/mach-footbridge/cats-pci.c3
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 35eb232a649a..ae3e1c8c7583 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;