From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 9 Mar 2015 20:27:18 +0000 (-0400)
Subject: serial: earlycon: Ignore parse_options() error code
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=526ebc3f56491fe971cd2b51cfc859a879e11e93;p=linux-beck.git

serial: earlycon: Ignore parse_options() error code

Because setup_earlycon() continues to attempt console registration
if an error occurred parsing the option string, the actual value of
the error code from parse_options() is ignored.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 0480c8f24cbb..da5e8c8c4ad4 100644
--- a/drivers/tty/serial/earlycon.c
+++ b/drivers/tty/serial/earlycon.c
@@ -114,9 +114,8 @@ int __init setup_earlycon(char *buf, const char *match,
 
 	buf += len + 1;
 
-	err = parse_options(&early_console_dev, buf);
 	/* On parsing error, pass the options buf to the setup function */
-	if (!err)
+	if (!parse_options(&early_console_dev, buf))
 		buf = NULL;
 
 	port->uartclk = BASE_BAUD * 16;