diff options
| author |   Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-12-21 13:43:35 +0000 |
| commit | c3b5725965228014215de553eed3492dbd80a4bd (patch) | |
| tree | 648e920cf4e47ec724613abbf1274345a0d1b50d /drivers/regulator | |
| parent | Merge branch 'regulator-4.21' into regulator-next (diff) | |
| parent | regulator: core: Don't double-disable supplies in regulator_disable_deferred() (diff) | |
| download | linux-dev-c3b5725965228014215de553eed3492dbd80a4bd.tar.xz linux-dev-c3b5725965228014215de553eed3492dbd80a4bd.zip | |
Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/core.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 0e402606e8be..b9d7b45c7295 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -211,6 +211,7 @@ void regulator_lock(struct regulator_dev *rdev) { regulator_lock_nested(rdev, NULL); } +EXPORT_SYMBOL_GPL(regulator_lock); /** * regulator_unlock - unlock a single regulator @@ -232,6 +233,7 @@ void regulator_unlock(struct regulator_dev *rdev) mutex_unlock(®ulator_nesting_mutex); } +EXPORT_SYMBOL_GPL(regulator_unlock); static bool regulator_supply_is_couple(struct regulator_dev *rdev) { @@ -2802,16 +2804,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); - } - } - } } /** |