From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 6 Feb 2013 11:28:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'regulator/fix/of' into tmp
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=44784cb32bc3d697e3ce90906ed9ef8a3ec2ca4b;hp=98380536ee1195dadee0ae5ec8b80e3eda8be15b

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

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 6f684916fd7..66ca769287a 100644
--- 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);