summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-r2d/irq.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-11-24 16:32:11 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-11-24 16:32:11 +0900
commit49fb2cd2571e0134e5a12c5abab227696e4940c7 (patch)
tree9a77364e988ef3f3af24feee3f5bb91bd0c34129 /arch/sh/boards/mach-r2d/irq.c
parentdfc349402de8e95f6a42e8341e9ea193b718eee3 (diff)
parent260af56271f79da0e37faa5a99b1786b221297e5 (diff)
downloadblackbird-op-linux-49fb2cd2571e0134e5a12c5abab227696e4940c7.tar.gz
blackbird-op-linux-49fb2cd2571e0134e5a12c5abab227696e4940c7.zip
Merge branch 'master' into sh/st-integration
Diffstat (limited to 'arch/sh/boards/mach-r2d/irq.c')
-rw-r--r--arch/sh/boards/mach-r2d/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-r2d/irq.c b/arch/sh/boards/mach-r2d/irq.c
index c70fecedcac4..78d7b27c80da 100644
--- a/arch/sh/boards/mach-r2d/irq.c
+++ b/arch/sh/boards/mach-r2d/irq.c
@@ -116,7 +116,7 @@ static unsigned char irl2irq[R2D_NR_IRL];
int rts7751r2d_irq_demux(int irq)
{
- if (irq >= R2D_NR_IRL || !irl2irq[irq])
+ if (irq >= R2D_NR_IRL || irq < 0 || !irl2irq[irq])
return irq;
return irl2irq[irq];
OpenPOWER on IntegriCloud