Unverified Commit 8ff00ba7 authored Nov 19, 2018 by Douglas Anderson Committed by Mark Brown Nov 20, 2018

regulator: core: Don't double-disable supplies in regulator_disable_deferred()



In the commit f8702f9e ("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: f8702f9e ("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>

parent 14a74272

drivers/regulator/core.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}
		}

		/**

Admin message