From: Douglas Anderson Date: Tue, 20 Nov 2018 00:26:50 +0000 (-0800) Subject: regulator: core: Don't double-disable supplies in regulator_disable_deferred() X-Git-Tag: v5.4-rc1~2003^2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8ff00ba79283e691ae294a158879237179c683eb;p=platform%2Fkernel%2Flinux-rpi.git 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 Reviewed-by: Dmitry Osipenko Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index f937a33..cfc2b8f 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); - } - } - } } /**