diff options
| author | Frank Rowand <frank.rowand@sonymobile.com> | 2014-06-15 07:39:05 +0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-06-16 22:31:44 +0400 |
| commit | 99de64984c3a7c9bf56a50e6dcc51006c9485620 (patch) | |
| tree | b01b4c17cef947bad5ea779622c8409d3ad20f42 /drivers/of/base.c | |
| parent | 28d3ee40ef5ad488f4ad3376d8f237b9502cecfb (diff) | |
| download | linux-99de64984c3a7c9bf56a50e6dcc51006c9485620.tar.xz | |
OF: fix of_find_node_by_path() assumption that of_allnodes is root
of_find_node_by_path() is borked because of_allnodes is not guaranteed to
contain the root of the tree after using any of the dynamic update functions
because some other nodes ends up as of_allnodes.
Fixes: c22e650e66b8 of: Make of_find_node_by_path() handle /aliases
Reported-by: pantelis.antoniou@konsulko.com
Signed-off-by: Frank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/base.c')
| -rw-r--r-- | drivers/of/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index f27d922eaece..b9864806e9b8 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1961,9 +1961,9 @@ int of_attach_node(struct device_node *np) raw_spin_lock_irqsave(&devtree_lock, flags); np->sibling = np->parent->child; - np->allnext = of_allnodes; + np->allnext = np->parent->allnext; + np->parent->allnext = np; np->parent->child = np; - of_allnodes = np; of_node_clear_flag(np, OF_DETACHED); raw_spin_unlock_irqrestore(&devtree_lock, flags); |