Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

regulator: Fix support for deviceless supply mappings

Browse source 
The patch to add support for looking up consumers by device name
had the side effect of causing us to require a device which is
at best premature since at least cpufreq still operates outside
the device model. Remove that requirement.

Reported-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
This commit is contained in:
Mark Brown 2009-07-21 16:00:26 +01:00 committed by Liam Girdwood
parent 6bf87d17c9
commit 9ed2099edc
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/regulator/core.c
View file

@ -872,6 +872,7 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
const char *supply) const char *supply)
{ {
struct regulator_map *node; struct regulator_map *node;
int has_dev;
if (consumer_dev && consumer_dev_name) if (consumer_dev && consumer_dev_name)
return -EINVAL; return -EINVAL;
@ -882,6 +883,11 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
if (supply == NULL) if (supply == NULL)
return -EINVAL; return -EINVAL;
if (consumer_dev_name != NULL)
has_dev = 1;
else
has_dev = 0;
list_for_each_entry(node, &regulator_map_list, list) { list_for_each_entry(node, &regulator_map_list, list) {
if (consumer_dev_name != node->dev_name) if (consumer_dev_name != node->dev_name)
continue; continue;
@ -896,17 +902,19 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
return -EBUSY; return -EBUSY;
} }
node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL); node = kzalloc(sizeof(struct regulator_map), GFP_KERNEL);
if (node == NULL) if (node == NULL)
return -ENOMEM; return -ENOMEM;
node->regulator = rdev; node->regulator = rdev;
node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
node->supply = supply; node->supply = supply;
if (node->dev_name == NULL) { if (has_dev) {
kfree(node); node->dev_name = kstrdup(consumer_dev_name, GFP_KERNEL);
return -ENOMEM; if (node->dev_name == NULL) {
kfree(node);
return -ENOMEM;
}
} }
list_add(&node->list, &regulator_map_list); list_add(&node->list, &regulator_map_list);