OF: fix of_find_node_by_path() assumption that of_allnodes is root
authorFrank Rowand <frank.rowand@sonymobile.com>
Sun, 15 Jun 2014 03:39:05 +0000 (20:39 -0700)
committerRob Herring <robh@kernel.org>
Mon, 16 Jun 2014 18:31:44 +0000 (13:31 -0500)
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>
drivers/of/base.c

index f27d922eaece0a4228eb75b42b93368d6da57a64..b9864806e9b811a0c3cc3b0e16404a19fad271eb 100644 (file)
@@ -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);