diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 11:36:16 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 11:36:16 +0000 |
| commit | 6806a663b0a1bb99b18fd5b49e81440eceb2d7a1 (patch) | |
| tree | f44cd2ccc862acc70944af3338c2c13c54b322f3 /drivers/regulator | |
| parent | 02fcc84ae551d27c0ef2ee043881cc2afc8f892d (diff) | |
| parent | bc91396b0b0a0d1300e151264b81f010c72a8bbf (diff) | |
Merge remote-tracking branch 'regulator/topic/dt' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/fixed.c | 6 | ||||
| -rw-r--r-- | drivers/regulator/of_regulator.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 716ea375f50..6828dce7237 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c @@ -51,7 +51,8 @@ struct fixed_voltage_data { * tree node, returns a pointer to the populated structure of NULL if memory * alloc fails. */ -struct fixed_voltage_config *of_get_fixed_voltage_config(struct device *dev) +static struct fixed_voltage_config * +of_get_fixed_voltage_config(struct device *dev) { struct fixed_voltage_config *config; struct device_node *np = dev->of_node; @@ -64,6 +65,9 @@ struct fixed_voltage_config *of_get_fixed_voltage_config(struct device *dev) return NULL; config->init_data = of_get_regulator_init_data(dev); + if (!config->init_data) + return NULL; + init_data = config->init_data; config->supply_name = init_data->constraints.name; diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 76673c784ab..acd7045d160 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -10,6 +10,7 @@ * (at your option) any later version. */ +#include <linux/module.h> #include <linux/slab.h> #include <linux/of.h> #include <linux/regulator/machine.h> @@ -79,3 +80,4 @@ struct regulator_init_data *of_get_regulator_init_data(struct device *dev) of_get_regulation_constraints(dev->of_node, &init_data); return init_data; } +EXPORT_SYMBOL_GPL(of_get_regulator_init_data); |