Commit bba18a1a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Petr Mladek

console: Propagate error code from console ->setup()

Since console ->setup() hook returns meaningful error codes,
propagate it to the caller of try_enable_new_console().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarPetr Mladek <pmladek@suse.com>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20200618164751.56828-6-andriy.shevchenko@linux.intel.com
parent 9f028427
...@@ -2668,7 +2668,7 @@ early_param("keep_bootcon", keep_bootcon_setup); ...@@ -2668,7 +2668,7 @@ early_param("keep_bootcon", keep_bootcon_setup);
static int try_enable_new_console(struct console *newcon, bool user_specified) static int try_enable_new_console(struct console *newcon, bool user_specified)
{ {
struct console_cmdline *c; struct console_cmdline *c;
int i; int i, err;
for (i = 0, c = console_cmdline; for (i = 0, c = console_cmdline;
i < MAX_CMDLINECONSOLES && c->name[0]; i < MAX_CMDLINECONSOLES && c->name[0];
...@@ -2691,8 +2691,8 @@ static int try_enable_new_console(struct console *newcon, bool user_specified) ...@@ -2691,8 +2691,8 @@ static int try_enable_new_console(struct console *newcon, bool user_specified)
return 0; return 0;
if (newcon->setup && if (newcon->setup &&
newcon->setup(newcon, c->options) != 0) (err = newcon->setup(newcon, c->options)) != 0)
return -EIO; return err;
} }
newcon->flags |= CON_ENABLED; newcon->flags |= CON_ENABLED;
if (i == preferred_console) { if (i == preferred_console) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment