aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:51 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-02-06 11:28:51 +0000
commit44784cb32bc3d697e3ce90906ed9ef8a3ec2ca4b (patch)
tree7cc3febfbfdeab665328fc487efc2fa6fd86c4ba
parent98380536ee1195dadee0ae5ec8b80e3eda8be15b (diff)
parenta2f95c363701deba2205f81929b40222ea6f4f80 (diff)
downloadlinux-stericsson-44784cb32bc3d697e3ce90906ed9ef8a3ec2ca4b.tar.gz
Merge remote-tracking branch 'regulator/fix/of' into tmp
-rw-r--r--drivers/regulator/of_regulator.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 6f684916fd79..66ca769287ab 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);