aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/regulator/of_regulator.c3
-rw-r--r--include/linux/regulator/of_regulator.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 3687a1c38c1c..64c09a37ac7f 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -221,7 +221,8 @@ int of_regulator_match(struct device *dev, struct device_node *node,
221 continue; 221 continue;
222 222
223 match->init_data = 223 match->init_data =
224 of_get_regulator_init_data(dev, child, NULL); 224 of_get_regulator_init_data(dev, child,
225 match->desc);
225 if (!match->init_data) { 226 if (!match->init_data) {
226 dev_err(dev, 227 dev_err(dev,
227 "failed to parse DT for regulator %s\n", 228 "failed to parse DT for regulator %s\n",
diff --git a/include/linux/regulator/of_regulator.h b/include/linux/regulator/of_regulator.h
index 8d1d136c0fb9..763953f7e3b8 100644
--- a/include/linux/regulator/of_regulator.h
+++ b/include/linux/regulator/of_regulator.h
@@ -13,6 +13,7 @@ struct of_regulator_match {
13 void *driver_data; 13 void *driver_data;
14 struct regulator_init_data *init_data; 14 struct regulator_init_data *init_data;
15 struct device_node *of_node; 15 struct device_node *of_node;
16 const struct regulator_desc *desc;
16}; 17};
17 18
18#if defined(CONFIG_OF) 19#if defined(CONFIG_OF)