2008-12-31 12:54:45

by Mark Brown

Subject: [PATCH] regulator: catch some registration errors

From: David Brownell <[email protected]>

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 <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/regulator/core.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 895f738..fcac9e5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -775,6 +775,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;
--
1.5.6.3

2009-01-05 12:04:45

by Liam Girdwood

Subject: Re: [PATCH] regulator: catch some registration errors

On Wed, 2008-12-31 at 12:54 +0000, Mark Brown wrote:
> From: David Brownell <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Mark Brown <[email protected]>

Applied.

Thanks

Liam