diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-22 12:24:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-22 12:24:42 +1000 |
| commit | 558c6e09e3ebc3b7d23c271e73f8ca000e82fc6d (patch) | |
| tree | ae49c8c3d4dc9684e54da065bbf30c2d065bfc69 | |
| parent | 332c50c3c39253b91c234463ed9aa5a6c52296af (diff) | |
| parent | 8c391e1afa7f9e35a815ba238f327284cff02be5 (diff) | |
Merge branch 'quilt/rr'
| -rw-r--r-- | kernel/params.c | 4 |
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; \ } \ |