summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2011-06-24 13:12:43 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2011-06-24 13:12:43 +1000
commitd97c0749927e2467ce8e252de2b811704645886d (patch)
tree56ac586441e85b56179f2abe326488b0f36c24b2 /kernel
parente7d77a7a8cd64995537bc8ce5276c02b8a124c69 (diff)
parent8c391e1afa7f9e35a815ba238f327284cff02be5 (diff)
Merge branch 'quilt/rr'
Diffstat (limited to 'kernel')
-rw-r--r--kernel/params.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/params.c b/kernel/params.c
index ed72e1330862..2a4ba258f04f 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -225,8 +225,8 @@ int parse_args(const char *name,
int ret; \
\
ret = strtolfn(val, 0, &l); \
- if (ret == -EINVAL || ((type)l != l)) \
- return -EINVAL; \
+ if (ret < 0 || ((type)l != l)) \
+ return ret < 0 ? ret : -EINVAL; \
*((type *)kp->arg) = l; \
return 0; \
} \