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>
This commit is contained in:
Родитель
b9c74fd7d2
Коммит
7dbe5849fb
|
@ -1859,6 +1859,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
|
||||||
{
|
{
|
||||||
struct property *pp;
|
struct property *pp;
|
||||||
|
|
||||||
|
of_aliases = of_find_node_by_path("/aliases");
|
||||||
of_chosen = of_find_node_by_path("/chosen");
|
of_chosen = of_find_node_by_path("/chosen");
|
||||||
if (of_chosen == NULL)
|
if (of_chosen == NULL)
|
||||||
of_chosen = of_find_node_by_path("/chosen@0");
|
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_stdout = of_find_node_by_path(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
of_aliases = of_find_node_by_path("/aliases");
|
|
||||||
if (!of_aliases)
|
if (!of_aliases)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче