2009-01-22 14:00:46

by Mike Rapoport

Subject: [PATCH] regulator: add unset_regulator_supplies to fix regulator_unregister

Currently regulator_unregister does not clear regulator <--> consumer
mapping.
This patch introduces unset_regulator_supplies that clear the map.

Signed-off-by: Mike Rapoport <[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 f511a40..ab1beec 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -817,6 +817,19 @@ static void unset_consumer_device_supply(struct regulator_dev *rdev,
}
}

+static void unset_regulator_supplies(struct regulator_dev *rdev)
+{
+ struct regulator_map *node, *n;
+
+ list_for_each_entry_safe(node, n, &regulator_map_list, list) {
+ if (rdev == node->regulator) {
+ list_del(&node->list);
+ kfree(node);
+ return;
+ }
+ }
+}
+
#define REG_STR_SIZE 32

static struct regulator *create_regulator(struct regulator_dev *rdev,
@@ -1945,6 +1958,7 @@ void regulator_unregister(struct regulator_dev *rdev)
return;

mutex_lock(&regulator_list_mutex);
+ unset_regulator_supplies(rdev);
list_del(&rdev->list);
if (rdev->supply)
sysfs_remove_link(&rdev->dev.kobj, "supply");
--
1.5.6.4



--
Sincerely yours,
Mike.

2009-01-22 14:11:58

by Mark Brown

Subject: Re: [PATCH] regulator: add unset_regulator_supplies to fix regulator_unregister

On Thu, Jan 22, 2009 at 04:00:29PM +0200, Mike Rapoport wrote:
> Currently regulator_unregister does not clear regulator <--> consumer
> mapping.
> This patch introduces unset_regulator_supplies that clear the map.

> Signed-off-by: Mike Rapoport <[email protected]>

Acked-by: Mark Brown <[email protected]>

2009-01-22 17:08:25

by Liam Girdwood

Subject: Re: [PATCH] regulator: add unset_regulator_supplies to fix regulator_unregister

On Thu, 2009-01-22 at 16:00 +0200, Mike Rapoport wrote:
> Currently regulator_unregister does not clear regulator <--> consumer
> mapping.
> This patch introduces unset_regulator_supplies that clear the map.
>
> Signed-off-by: Mike Rapoport <[email protected]>
> ---
> drivers/regulator/core.c | 14 ++++++++++++++
> 1 files changed, 14 insertions(+), 0 deletions(-)
>

Applied.

Thanks

Liam