From: Grant Likely Date: Wed, 16 Jul 2014 14:48:46 +0000 (-0600) Subject: of: Make sure attached nodes don't carry along extra children X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6162dbe49a451f96431a23b4821f05e3bd925bc1;p=linux-beck.git of: Make sure attached nodes don't carry along extra children The child pointer does not get cleared when attaching new nodes which could cause the tree to be inconsistent. Clear the child pointer in __of_attach_node() to be absolutely sure that the structure remains in a consistent layout. Signed-off-by: Grant Likely --- diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index c875787fa394..b96d83100987 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -98,6 +98,7 @@ int of_property_notify(int action, struct device_node *np, void __of_attach_node(struct device_node *np) { + np->child = NULL; np->sibling = np->parent->child; np->allnext = np->parent->allnext; np->parent->allnext = np;