summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>2019-02-08 08:41:53 +0100
committerMark Brown <broonie@kernel.org>2019-02-08 13:05:14 +0000
commit82874ba4c6455ca8a90a8fe59834baa4cd4a1e50 (patch)
tree41a9c5b89d1ef0329a2ec9c92d19dcefa2d6e503
parent9df3bb319c449c6723c2c2a1c78db45301fd8669 (diff)
regulator: fix device unlinking
Device links are refcounted, device_link_remove() has to be called as many times as device_link_add(). Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--drivers/regulator/core.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index b9d7b45c7295..2994ee023b40 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2058,15 +2058,7 @@ static void _regulator_put(struct regulator *regulator)
debugfs_remove_recursive(regulator->debugfs);
if (regulator->dev) {
- int count = 0;
- struct regulator *r;
-
- list_for_each_entry(r, &rdev->consumer_list, list)
- if (r->dev == regulator->dev)
- count++;
-
- if (count == 1)
- device_link_remove(regulator->dev, &rdev->dev);
+ device_link_remove(regulator->dev, &rdev->dev);
/* remove any sysfs entries */
sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);