[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <49787BFD.3020702@compulab.co.il>
Date: Thu, 22 Jan 2009 16:00:29 +0200
From: Mike Rapoport <mike@...pulab.co.il>
To: Liam Girdwood <lrg@...mlogic.co.uk>
CC: LKML <linux-kernel@...r.kernel.org>
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 <mike@...pulab.co.il>
---
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, ®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,
@@ -1945,6 +1958,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");
--
1.5.6.4
--
Sincerely yours,
Mike.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists