mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

of: make sure of_alias is initialized before accessing it

Browse source 
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:
Laurentiu Tudor 2014-08-27 17:09:39 +03:00 committed by Grant Likely
parent b9c74fd7d2
commit 7dbe5849fb
1 changed files with 1 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/of/base.c
View file

@ -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;