From c1a16d2f445deaf15a071d35824ca20d1c9703fe Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 8 Aug 2008 21:22:35 +0100 Subject: [PATCH] --- yaml --- r: 108621 b: refs/heads/master c: e38d523fd0932a5d4ef2865360d8828efcf05392 h: refs/heads/master i: 108619: a74d9f13c052d3386fa6f6f27ed7bc0ee1211ebe v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-footbridge/cats-pci.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5197e476dd45..81da02d5a67f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29210475945f13c61a7994b54ccf37692a075aeb +refs/heads/master: e38d523fd0932a5d4ef2865360d8828efcf05392 diff --git a/trunk/arch/arm/mach-footbridge/cats-pci.c b/trunk/arch/arm/mach-footbridge/cats-pci.c index 35eb232a649a..ae3e1c8c7583 100644 --- a/trunk/arch/arm/mach-footbridge/cats-pci.c +++ b/trunk/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;