Merge remote-tracking branch 'regulator/fix/of' into tmp
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:51 +0000 (11:28 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Feb 2013 11:28:51 +0000 (11:28 +0000)
drivers/regulator/of_regulator.c

index 6f684916fd7914450bfea4170ee884f5538ee281..66ca769287ab3427aa9ac8695ad5a67ca5dc77c3 100644 (file)
@@ -120,6 +120,12 @@ int of_regulator_match(struct device *dev, struct device_node *node,
        if (!dev || !node)
                return -EINVAL;
 
+       for (i = 0; i < num_matches; i++) {
+               struct of_regulator_match *match = &matches[i];
+               match->init_data = NULL;
+               match->of_node = NULL;
+       }
+
        for_each_child_of_node(node, child) {
                name = of_get_property(child,
                                        "regulator-compatible", NULL);