aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPantelis Antoniou <panto@antoniou-consulting.com>2013-11-08 10:03:57 -0500
committerGrant Likely <grant.likely@linaro.org>2014-02-03 09:23:38 -0500
commite3963fd60a83967573f6330c9db134bd581da746 (patch)
tree64e6259e7a5d2cad8260c026ee4807de614fb44a
parent588453c69dace39351129a038dd2796608f74bb3 (diff)
of: Clear detach flag on attach
When attaching a node always clear the detach flag. Without this change the sequence detach, attach fails. Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com> Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r--drivers/of/base.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c
index ff85450d5683..87038d80b473 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1692,6 +1692,7 @@ int of_attach_node(struct device_node *np)
1692 np->allnext = of_allnodes; 1692 np->allnext = of_allnodes;
1693 np->parent->child = np; 1693 np->parent->child = np;
1694 of_allnodes = np; 1694 of_allnodes = np;
1695 of_node_clear_flag(np, OF_DETACHED);
1695 raw_spin_unlock_irqrestore(&devtree_lock, flags); 1696 raw_spin_unlock_irqrestore(&devtree_lock, flags);
1696 1697
1697 of_add_proc_dt_entry(np); 1698 of_add_proc_dt_entry(np);