Subject: [PATCH 3/5] of/device: Make of_get_next_child() check status properties

From: Deepak Saxena <[email-masked]>
Date: Wed, 8 Dec 2010 11:29:44 -0800

We only return the next child if the device is available.

Signed-off-by: Hollis Blanchard <[email-masked]>
Signed-off-by: Deepak Saxena <[email-masked]>
---
 drivers/of/base.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 5d269a4..81b2601 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -321,6 +321,8 @@ struct device_node *of_get_next_parent(struct device_node *node)
  *
  *	Returns a node pointer with refcount incremented, use
  *	of_node_put() on it when done.
+ *
+ *	Does not return nodes marked unavailable by a status property.
  */
 struct device_node *of_get_next_child(const struct device_node *node,
 	struct device_node *prev)
@@ -330,7 +332,7 @@ struct device_node *of_get_next_child(const struct device_node *node,
 	read_lock(&devtree_lock);
 	next = prev ? prev->sibling : node->child;
 	for (; next; next = next->sibling)
-		if (of_node_get(next))
+		if (of_device_is_available(next) && of_node_get(next))
 			break;
 	of_node_put(prev);
 	read_unlock(&devtree_lock);
-- 
1.6.3.3