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 <[email protected]>
Signed-off-by: Peter Hurley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c
index 0480c8f24cbbd621756bac399ff821b5d03378c3..da5e8c8c4ad4ff122f56e246431aeb7517f15747 100644 (file)
--- 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;