diff options
| author | Laurentiu Tudor <b10716@freescale.com> | 2014-08-27 18:09:39 +0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-09-08 18:57:26 +0400 |
| commit | 7dbe5849fb50fc9b5b77a8f590c87a577ddc9bb6 (patch) | |
| tree | 9671581b49986f4fedaafe72b8ca45c949e7ab54 | |
| parent | b9c74fd7d231d4086eb6b6af60dccd666cda1288 (diff) | |
| download | linux-7dbe5849fb50fc9b5b77a8f590c87a577ddc9bb6.tar.xz | |
of: make sure of_alias is initialized before accessing it
Simply swap of_alias and of_chosen initialization so
that of_alias ends up read first. This must be done
because it is accessed couple of lines below when
trying to initialize the of_stdout using the alias
based legacy method.
[Fixes a752ee5 - tty: Update hypervisor tty drivers to
use core stdout parsing code]
Signed-off-by: Laurentiu Tudor <Laurentiu.Tudor@freescale.com>
[glikely: Don't move the 'if (!of_aliases)' test]
Signed-off-by: Grant Likely <grant.likely@linaro.org>
| -rw-r--r-- | drivers/of/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 7af64c48ca42..293ed4b687ba 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1859,6 +1859,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) { struct property *pp; + of_aliases = of_find_node_by_path("/aliases"); of_chosen = of_find_node_by_path("/chosen"); if (of_chosen == NULL) of_chosen = of_find_node_by_path("/chosen@0"); @@ -1874,7 +1875,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) of_stdout = of_find_node_by_path(name); } - of_aliases = of_find_node_by_path("/aliases"); if (!of_aliases) return; |