From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qg0-f48.google.com (mail-qg0-f48.google.com [209.85.192.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 592AF1A0ED3 for ; Wed, 18 Mar 2015 07:46:57 +1100 (AEDT) Received: by qgfa8 with SMTP id a8so20146417qgf.0 for ; Tue, 17 Mar 2015 13:46:55 -0700 (PDT) From: Peter Hurley To: Rob Herring , Grant Likely 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> Cc: devicetree@vger.kernel.org, Peter Hurley , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Pranith Kumar , linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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