From 0f1d747bfa89de4ca52dc1dffdcce35a2b8a1532 Mon Sep 17 00:00:00 2001 From: Mike Rapoport Date: Thu, 22 Jan 2009 16:00:29 +0200 Subject: 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 Acked-by: Mark Brown Signed-off-by: Liam Girdwood --- drivers/regulator/core.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0ed13c2a8c3..b85e4a9dafc 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -831,6 +831,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, ®ulator_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, @@ -1970,6 +1983,7 @@ void regulator_unregister(struct regulator_dev *rdev) return; mutex_lock(®ulator_list_mutex); + unset_regulator_supplies(rdev); list_del(&rdev->list); if (rdev->supply) sysfs_remove_link(&rdev->dev.kobj, "supply"); -- cgit v1.2.3