summaryrefslogtreecommitdiff
path: root/arch/cris/arch-v32/mach-fs/pinmux.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 10:17:32 +0300
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-03-09 10:17:32 +0300
commitce67eef6a112bb283c6db39f9195800f31f5599a (patch)
tree34f2e7fbd0b9838abba482dbb1a7db09e6fbb53c /arch/cris/arch-v32/mach-fs/pinmux.c
parent776943fd6f104a6e8457dc95a17282e69e963666 (diff)
parent57d54889cd00db2752994b389ba714138652e60c (diff)
downloadlinux-ce67eef6a112bb283c6db39f9195800f31f5599a.tar.xz
Merge commit 'v2.6.34-rc1' into for-linus
Diffstat (limited to 'arch/cris/arch-v32/mach-fs/pinmux.c')
-rw-r--r--arch/cris/arch-v32/mach-fs/pinmux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/mach-fs/pinmux.c b/arch/cris/arch-v32/mach-fs/pinmux.c
index d722ad9ae626..38f29eec14a6 100644
--- a/arch/cris/arch-v32/mach-fs/pinmux.c
+++ b/arch/cris/arch-v32/mach-fs/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);
@@ -195,7 +195,7 @@ int 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);