From 9c81a5f935deffb1a6cb7cea88ad8f51d9e23152 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Tue, 17 Mar 2015 16:46:33 -0400 Subject: [PATCH] Revert "of: Fix premature bootconsole disable with 'stdout-path'" This reverts commit d88da816cf3df5d5d43f0fb31b3e94a8597caac6. 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 Signed-off-by: Rob Herring --- 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 966d6fdcf4272..8f165b112e03a 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1888,10 +1888,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.39.5