diff options
| author | Mark Brown <broonie@kernel.org> | 2017-09-04 19:54:34 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-09-04 19:54:34 +0300 |
| commit | a69064e75ee6303f505f256a675c20e0e54c4f2c (patch) | |
| tree | e935e737ad8d99a6dc45716d5a8f7b8e261f6a77 | |
| parent | 569dbb88e80deb68974ef6fdd6a13edb9d686261 (diff) | |
| parent | c9ccaa0cac3fc8e7d17a668aabfdf632c7c0517a (diff) | |
| download | linux-a69064e75ee6303f505f256a675c20e0e54c4f2c.tar.xz | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e567fa54980b..9f4d484eb25d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2396,6 +2396,14 @@ static void regulator_disable_work(struct work_struct *work) count = rdev->deferred_disables; rdev->deferred_disables = 0; + /* + * Workqueue functions queue the new work instance while the previous + * work instance is being processed. Cancel the queued work instance + * as the work instance under processing does the job of the queued + * work instance. + */ + cancel_delayed_work(&rdev->disable_work); + for (i = 0; i < count; i++) { ret = _regulator_disable(rdev); if (ret != 0) @@ -2439,10 +2447,10 @@ int regulator_disable_deferred(struct regulator *regulator, int ms) mutex_lock(&rdev->mutex); rdev->deferred_disables++; + mod_delayed_work(system_power_efficient_wq, &rdev->disable_work, + msecs_to_jiffies(ms)); mutex_unlock(&rdev->mutex); - queue_delayed_work(system_power_efficient_wq, &rdev->disable_work, - msecs_to_jiffies(ms)); return 0; } EXPORT_SYMBOL_GPL(regulator_disable_deferred); |