Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753490AbbBXQht (ORCPT ); Tue, 24 Feb 2015 11:37:49 -0500 Received: from mail-qg0-f41.google.com ([209.85.192.41]:53369 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753411AbbBXQho (ORCPT ); Tue, 24 Feb 2015 11:37:44 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Andrew Morton Cc: Arnd Bergmann , Rob Herring , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH -next 09/13] serial: earlycon: Ignore parse_options() error code Date: Tue, 24 Feb 2015 11:37:06 -0500 Message-Id: <1424795830-31223-10-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> References: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1089 Lines: 32 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. Signed-off-by: Peter Hurley --- drivers/tty/serial/earlycon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/tty/serial/earlycon.c b/drivers/tty/serial/earlycon.c index 0480c8f..da5e8c8 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; -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/