summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-03-09 16:27:18 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 16:17:56 +0100
commit526ebc3f56491fe971cd2b51cfc859a879e11e93 (patch)
treef1fcbf5691e867d5a9644cb2f10577c530ac38e7 /drivers/tty
parentcd385e9a2a2daa7e74003f930886e4c1cdf032f4 (diff)
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>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/earlycon.c3
1 files changed, 1 insertions, 2 deletions
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;