diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-09 15:53:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-09 15:53:39 -0800 |
| commit | 50c36504fc6090847f1fbdc7cf4852ae16d6e500 (patch) | |
| tree | aa43bb2839cbb733c2aa59fefc45b5c757458582 /kernel/params.c | |
| parent | ce5c2d2c256a4c8b523036537cd6be2d6af8f69d (diff) | |
| parent | d1189c63ea5e3272dc390a83e1235f142b739eb4 (diff) | |
| download | linux-stable-50c36504fc6090847f1fbdc7cf4852ae16d6e500.tar.gz linux-stable-50c36504fc6090847f1fbdc7cf4852ae16d6e500.tar.bz2 linux-stable-50c36504fc6090847f1fbdc7cf4852ae16d6e500.zip | |
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull module updates from Rusty Russell:
"Nothing exciting, minor tweaks and cleanups"
* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
scripts: [modpost] add new sections to white list
modpost: Add flag -E for making section mismatches fatal
params: don't ignore the rest of cmdline if parse_one() fails
modpost: abort if a module symbol is too long
Diffstat (limited to 'kernel/params.c')
| -rw-r--r-- | kernel/params.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel/params.c b/kernel/params.c index 93a380a2345d..a6d6149c0fe6 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -223,7 +223,7 @@ char *parse_args(const char *doing, int (*unknown)(char *param, char *val, const char *doing, void *arg)) { - char *param, *val; + char *param, *val, *err = NULL; /* Chew leading spaces */ args = skip_spaces(args); @@ -238,7 +238,7 @@ char *parse_args(const char *doing, args = next_arg(args, ¶m, &val); /* Stop at -- */ if (!val && strcmp(param, "--") == 0) - return args; + return err ?: args; irq_was_disabled = irqs_disabled(); ret = parse_one(param, val, doing, params, num, min_level, max_level, arg, unknown); @@ -247,24 +247,25 @@ char *parse_args(const char *doing, doing, param); switch (ret) { + case 0: + continue; case -ENOENT: pr_err("%s: Unknown parameter `%s'\n", doing, param); - return ERR_PTR(ret); + break; case -ENOSPC: pr_err("%s: `%s' too large for parameter `%s'\n", doing, val ?: "", param); - return ERR_PTR(ret); - case 0: break; default: pr_err("%s: `%s' invalid for parameter `%s'\n", doing, val ?: "", param); - return ERR_PTR(ret); + break; } + + err = ERR_PTR(ret); } - /* All parsed OK. */ - return NULL; + return err; } /* Lazy bastard, eh? */ |