Messages in this thread Patch in this message | | | From | Mark Brown <> | Subject | Applied "regulator: core: Don't double-disable supplies in regulator_disable_deferred()" to the regulator tree | Date | Tue, 20 Nov 2018 17:10:29 +0000 (GMT) |
| |
The patch
regulator: core: Don't double-disable supplies in regulator_disable_deferred()
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 8ff00ba79283e691ae294a158879237179c683eb Mon Sep 17 00:00:00 2001 From: Douglas Anderson <dianders@chromium.org> Date: Mon, 19 Nov 2018 16:26:50 -0800 Subject: [PATCH] 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> --- drivers/regulator/core.c | 10 ---------- 1 file changed, 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); - } - } - } } /** -- 2.19.0.rc2
| |