aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-12-31 12:54:19 +0000
committerLiam Girdwood <lrg@slimlogic.co.uk>2009-01-08 20:10:34 +0000
commit6001e13c5f708eb68c744a69df3c2c281156030d (patch)
treeff75cc5f48cf3d094ac65d27428b9f2fc176d2e0 /drivers/regulator
parent9fe5817f196054142b9a13ed78c73b76a29f2ea3 (diff)
downloadkernel_samsung_aries-6001e13c5f708eb68c744a69df3c2c281156030d.zip
kernel_samsung_aries-6001e13c5f708eb68c744a69df3c2c281156030d.tar.gz
kernel_samsung_aries-6001e13c5f708eb68c744a69df3c2c281156030d.tar.bz2
regulator: catch some registration errors
Prevent registration of duplicate "struct regulator" names. They'd be unavailable, and clearly indicate something wrong. [Edited to remove check for NULL consumer device until we have a solution for things like cpufreq -- broonie] Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7341c97..f511a40 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -776,6 +776,20 @@ static int set_consumer_device_supply(struct regulator_dev *rdev,
if (supply == NULL)
return -EINVAL;
+ list_for_each_entry(node, &regulator_map_list, list) {
+ if (consumer_dev != node->dev)
+ continue;
+ if (strcmp(node->supply, supply) != 0)
+ continue;
+
+ dev_dbg(consumer_dev, "%s/%s is '%s' supply; fail %s/%s\n",
+ dev_name(&node->regulator->dev),
+ node->regulator->desc->name,
+ supply,
+ dev_name(&rdev->dev), rdev->desc->name);
+ return -EBUSY;
+ }
+
node = kmalloc(sizeof(struct regulator_map), GFP_KERNEL);
if (node == NULL)
return -ENOMEM;