Merge remote-tracking branch 'regulator/fix/of' into tmp

git-mirror · Feb 6, 2013 · 44784cb · 44784cb
2 parents 9838053 + a2f95c3
commit 44784cb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
@@ -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);