[PATCH] regulator: core: Keep regulators-list locked while traversing the list
From: Dmitry Osipenko
Date: Sun Nov 18 2018 - 16:56:19 EST
It's unlikely that regulators may disappear/appear while regulators
debug-summary is being prepared, but let's be consistent and avoid that
situation.
Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
---
drivers/regulator/core.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index e46e53aa43db..fd237bc0fa7c 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4936,7 +4936,9 @@ void regulator_unregister(struct regulator_dev *rdev)
regulator_disable(rdev->supply);
regulator_put(rdev->supply);
}
+
mutex_lock(®ulator_list_mutex);
+
debugfs_remove_recursive(rdev->debugfs);
flush_work(&rdev->disable_work.work);
WARN_ON(rdev->open_count);
@@ -4944,8 +4946,9 @@ void regulator_unregister(struct regulator_dev *rdev)
unset_regulator_supplies(rdev);
list_del(&rdev->list);
regulator_ena_gpio_free(rdev);
- mutex_unlock(®ulator_list_mutex);
device_unregister(&rdev->dev);
+
+ mutex_unlock(®ulator_list_mutex);
}
EXPORT_SYMBOL_GPL(regulator_unregister);
@@ -5278,6 +5281,8 @@ static void regulator_summary_lock(struct ww_acquire_ctx *ww_ctx)
struct regulator_dev *old_contended_rdev = NULL;
int err;
+ mutex_lock(®ulator_list_mutex);
+
ww_acquire_init(ww_ctx, ®ulator_ww_class);
do {
@@ -5304,6 +5309,8 @@ static void regulator_summary_unlock(struct ww_acquire_ctx *ww_ctx)
class_for_each_device(®ulator_class, NULL, NULL,
regulator_summary_unlock_one);
ww_acquire_fini(ww_ctx);
+
+ mutex_unlock(®ulator_list_mutex);
}
static int regulator_summary_show_roots(struct device *dev, void *data)
--
2.19.0.rc2