From: Pantelis Antoniou <panto@antoniou-consulting.com>
Date: Fri, 8 Nov 2013 15:03:57 +0000 (+0200)
Subject: of: Clear detach flag on attach
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e3963fd60a83967573f6330c9db134bd581da746;p=deliverable%2Flinux.git

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

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)
 	np->allnext = of_allnodes;
 	np->parent->child = np;
 	of_allnodes = np;
+	of_node_clear_flag(np, OF_DETACHED);
 	raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
 	of_add_proc_dt_entry(np);