From 60846880384f00713c7f54243f749c1923e6c0e3 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Mon, 9 Mar 2015 16:27:19 -0400 Subject: serial: earlycon: Skip parse_options() if empty string Earlycon param strings of the form earlycon= 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 Signed-off-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/earlycon.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'drivers/tty/serial') diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index da5e8c8c4ad4..025ea0140896 100644 --- a/drivers/tty/serial/earlycon.c +++ b/drivers/tty/serial/earlycon.c @@ -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; -- cgit v1.2.3