aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/fixed.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-12-01 04:21:06 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-05 14:10:17 -0500
commitd9a861cce10596ae1f10cffefe1ad4519a253475 (patch)
treefac8fb1171d8422a2e4686edbed59a6bf91d764d /drivers/regulator/fixed.c
parentab62aa931ed3512bc67857a03636756b96c78eae (diff)
regulator: pass device_node to of_get_regulator_init_data()
It's not always true that the device_node of regulator can be found at dev->of_node at the time when of_get_regulator_init_data() is being called, because in some cases the regulator nodes in device tree do not have 'struct device' behind them until regulator_dev gets created for it by core function regulator_register(). The patch adds device_node as a new parameter to of_get_regulator_init_data(), so that caller can pass in the node of regulator directly. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/fixed.c')
-rw-r--r--drivers/regulator/fixed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index ebec5e06dfa1..12d08c694ae2 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -64,7 +64,7 @@ of_get_fixed_voltage_config(struct device *dev)
64 if (!config) 64 if (!config)
65 return NULL; 65 return NULL;
66 66
67 config->init_data = of_get_regulator_init_data(dev); 67 config->init_data = of_get_regulator_init_data(dev, dev->of_node);
68 if (!config->init_data) 68 if (!config->init_data)
69 return NULL; 69 return NULL;
70 70