From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754480AbbCQUq5 (ORCPT ); Tue, 17 Mar 2015 16:46:57 -0400 Received: from mail-qg0-f47.google.com ([209.85.192.47]:33889 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753294AbbCQUqz (ORCPT ); Tue, 17 Mar 2015 16:46:55 -0400 From: Peter Hurley To: Rob Herring , Grant Likely Cc: devicetree@vger.kernel.org, Greg Kroah-Hartman , Pranith Kumar , Michael Ellerman , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'" Date: Tue, 17 Mar 2015 16:46:33 -0400 Message-Id: <1426625193-5055-1-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This reverts commit 2fa645cb2703d9b3786d850db815414dfeefa51d. The assumption that at least 1 preferred console will be registered when the stdout-path property is set is invalid, which can result in _no_ consoles. Signed-off-by: Peter Hurley --- drivers/of/base.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index adb8764..8b904e5 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1893,10 +1893,8 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) name = of_get_property(of_chosen, "linux,stdout-path", NULL); if (IS_ENABLED(CONFIG_PPC) && !name) name = of_get_property(of_aliases, "stdout", NULL); - if (name) { + if (name) of_stdout = of_find_node_opts_by_path(name, &of_stdout_options); - add_preferred_console("stdout-path", 0, NULL); - } } if (!of_aliases) -- 2.3.3