summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2018-11-19 16:26:50 -0800
committerMark Brown <broonie@kernel.org>2018-11-20 17:07:50 +0000
commit8ff00ba79283e691ae294a158879237179c683eb (patch)
tree8a03a5266e3c7c1d36dfc585b3e22fc5fa015188 /drivers/regulator/core.c
parent14a742724fc0f089893c6f70a62d30ab418ed7ff (diff)
downloadlinux-8ff00ba79283e691ae294a158879237179c683eb.tar.bz2
regulator: core: Don't double-disable supplies in regulator_disable_deferred()
In the commit f8702f9e4aa7 ("regulator: core: Use ww_mutex for regulators locking") disabling of the supply was moved into _regulator_disable(). That means regulator_disable_work() shouldn't be disabling since that double-disables the supply. Fixes: f8702f9e4aa7 ("regulator: core: Use ww_mutex for regulators locking") Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index f937a33e5f02..cfc2b8f6453b 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2670,16 +2670,6 @@ static void regulator_disable_work(struct work_struct *work)
regulator_balance_voltage(rdev, PM_SUSPEND_ON);
regulator_unlock_dependent(rdev, &ww_ctx);
-
- if (rdev->supply) {
- for (i = 0; i < count; i++) {
- ret = regulator_disable(rdev->supply);
- if (ret != 0) {
- rdev_err(rdev,
- "Supply disable failed: %d\n", ret);
- }
- }
- }
}
/**