]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
of: property: Fix create device links for all child-supplier dependencies
authorNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Mon, 20 Apr 2020 12:01:01 +0000 (14:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:48:37 +0000 (17:48 +0200)
[ Upstream commit ed3655729182a59b9bef1b564c6fc2dcbbbe954e ]

Upon adding a new device from a DT node, we scan its properties and its
children's properties in order to create a consumer/supplier
relationship between the device and the property provider.

That said, it's possible for some of the node's children to be disabled,
which will create links that'll never be fulfilled.

To get around this, use the for_each_available_child_of_node() function
instead of for_each_available_node() when iterating over the node's
children.

Fixes: d4387cd11741 ("of: property: Create device links for all child-supplier depencencies")
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Saravana Kannan <saravanak@google.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/of/property.c

index b4916dcc9e7250552cc583daf9f39037edc18b2c..a8c2b13521b27d0b5891503fe469da4d47077ef6 100644 (file)
@@ -1296,7 +1296,7 @@ static int of_link_to_suppliers(struct device *dev,
                if (of_link_property(dev, con_np, p->name))
                        ret = -ENODEV;
 
-       for_each_child_of_node(con_np, child)
+       for_each_available_child_of_node(con_np, child)
                if (of_link_to_suppliers(dev, child) && !ret)
                        ret = -EAGAIN;