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>
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 7af64c4..293ed4b 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1859,6 +1859,7 @@
{
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 @@
of_stdout = of_find_node_by_path(name);
}
- of_aliases = of_find_node_by_path("/aliases");
if (!of_aliases)
return;