Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / of_regulator.c

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index e221cb1ce8edffee78c2342fb6be8d0bd7ba658c..b1c485b24ab246234edbab2dfb4217e4fe1df833 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -304,7 +304,7 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
                return NULL;
        }
 
-       for_each_child_of_node(search, child) {
+       for_each_available_child_of_node(search, child) {
                name = of_get_property(child, "regulator-compatible", NULL);
                if (!name)
                        name = child->name;