Revert "of: Fix premature bootconsole disable with 'stdout-path'"

This reverts commit 2fa645c. 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 <[email protected]> Signed-off-by: Rob Herring <[email protected]>
ambv · Mar 19, 2015 · f64255b · f64255b
1 parent 721a09e
commit f64255b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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)