Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-06 11:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: earlycon: Skip parse_options() if empty string

Browse Source 
Earlycon param strings of the form
   earlycon=<name>
are rejected from parse_options() with an error (which, in turn,
results in a NULL argument for the setup() method options parameter).

Only pass non-empty string to parse_options(); this will enable
handling actual parse errors differently than expected and allow
formats.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2015-03-09 16:27:19 -04:00 committed by Greg Kroah-Hartman
parent 526ebc3f56
commit 6084688038
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serial/earlycon.c
View File

@ -109,13 +109,16 @@ int __init setup_earlycon(char *buf, const char *match,
len = strlen(match);
if (strncmp(buf, match, len))
return 0;
if (buf[len] && (buf[len] != ','))
return 0;
buf += len + 1;
if (buf[len]) {
if (buf[len] != ',')
return 0;
buf += len + 1;
} else
buf = NULL;
/* On parsing error, pass the options buf to the setup function */
if (!parse_options(&early_console_dev, buf))
if (buf && !parse_options(&early_console_dev, buf))
buf = NULL;
port->uartclk = BASE_BAUD * 16;