leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'regulator/topic/dt' into regulator-next

Browse Source
This commit is contained in:
Mark Brown 2011-11-27 11:36:16 +00:00
commit 6806a663b0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/regulator/fixed.c
View File

@ -51,7 +51,8 @@ struct fixed_voltage_data {
* tree node, returns a pointer to the populated structure of NULL if memory * tree node, returns a pointer to the populated structure of NULL if memory
* alloc fails. * 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 fixed_voltage_config *config;
struct device_node *np = dev->of_node; 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; return NULL;
config->init_data = of_get_regulator_init_data(dev); config->init_data = of_get_regulator_init_data(dev);
if (!config->init_data)
return NULL;
init_data = config->init_data; init_data = config->init_data;
config->supply_name = init_data->constraints.name; config->supply_name = init_data->constraints.name;

2
drivers/regulator/of_regulator.c
View File

@ -10,6 +10,7 @@
* (at your option) any later version. * (at your option) any later version.
*/ */
#include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/regulator/machine.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); of_get_regulation_constraints(dev->of_node, &init_data);
return init_data; return init_data;
} }
EXPORT_SYMBOL_GPL(of_get_regulator_init_data);