Browse Source

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

Mark Brown 12 years ago
parent
commit
44784cb32b
1 changed files with 6 additions and 0 deletions
  1. 6 0
      drivers/regulator/of_regulator.c

+ 6 - 0
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);