diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-03-17 23:46:33 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-19 16:46:54 +0300 |
| commit | f64255b5072d9c46cef8655d51cf7e10285abed7 (patch) | |
| tree | f878ec8b269a346f4cef5df9ca2ae5fcad6576e8 /drivers | |
| parent | 721a09e95c786346b4188863a1cfa3909c76f690 (diff) | |
| download | linux-f64255b5072d9c46cef8655d51cf7e10285abed7.tar.xz | |
Revert "of: Fix premature bootconsole disable with 'stdout-path'"
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 <peter@hurleysoftware.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/base.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 966d6fdcf427..8f165b112e03 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) |