summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/kernel/pinmux.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 10:06:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-01 10:06:09 -0800
commit8098a7ef8946169cf8ffeb6f4d8130fc3651192e (patch)
tree90d2da5a7340a1cbaf5f779986d733a900b88f15 /arch/cris/arch-v32/kernel/pinmux.c
parent4805a1b0e6d74feb6428c05116a2886a076ee341 (diff)
parentd8fe989e7368a26e4baf9acb55524c71e5c3a117 (diff)
downloadop-kernel-dev-8098a7ef8946169cf8ffeb6f4d8130fc3651192e.zip
op-kernel-dev-8098a7ef8946169cf8ffeb6f4d8130fc3651192e.tar.gz
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror: cris: Fixup last users of irq_chip->typename CRIS v32: Should index be positive?
Diffstat (limited to 'arch/cris/arch-v32/kernel/pinmux.c')
-rw-r--r--arch/cris/arch-v32/kernel/pinmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/kernel/pinmux.c b/arch/cris/arch-v32/kernel/pinmux.c
index 6eb54ea..f6f3637 100644
--- a/arch/cris/arch-v32/kernel/pinmux.c
+++ b/arch/cris/arch-v32/kernel/pinmux.c
@@ -54,7 +54,7 @@ crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode mode)
crisv32_pinmux_init();
- if (port > PORTS)
+ if (port > PORTS || port < 0)
return -EINVAL;
spin_lock_irqsave(&pinmux_lock, flags);
@@ -197,7 +197,7 @@ crisv32_pinmux_dealloc(int port, int first_pin, int last_pin)
crisv32_pinmux_init();
- if (port > PORTS)
+ if (port > PORTS || port < 0)
return -EINVAL;
spin_lock_irqsave(&pinmux_lock, flags);
OpenPOWER on IntegriCloud