From: Douglas Anderson Subject: [PATCH 3/7] regulator: core: Don't double-disable supplies in regulator_disable_deferred() Date: Mon, 19 Nov 2018 16:26:50 -0800 Message-ID: <20181120002654.1891-3-dianders@chromium.org> References: <20181120002654.1891-1-dianders@chromium.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20181120002654.1891-1-dianders@chromium.org> Sender: linux-kernel-owner@vger.kernel.org To: Mark Brown Cc: Bjorn Andersson , evgreen@chromium.org, swboyd@chromium.org, Dmitry Osipenko , ryandcase@chromium.org, David Collins , linux-arm-msm@vger.kernel.org, Douglas Anderson , Liam Girdwood , linux-kernel@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org 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 --- drivers/regulator/core.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0052bbc8c531..63a8af1e2256 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2703,16 +2703,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.1.1215.g8438c0b245-goog