Commit c6d1fec4 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Luis Henriques

regulator: Only enable disabled regulators on resume

commit 0548bf4f upstream.

The _regulator_do_enable() call ought to be a no-op when called on an
already-enabled regulator.  However, as an optimization
_regulator_enable() doesn't call _regulator_do_enable() on an already
enabled regulator.  That means we never test the case of calling
_regulator_do_enable() during normal usage and there may be hidden
bugs or warnings.  We have seen warnings issued by the tps65090 driver
and bugs when using the GPIO enable pin.

Let's match the same optimization that _regulator_enable() in
regulator_suspend_finish().  That may speed up suspend/resume and also
avoids exposing hidden bugs.

[Use much clearer commit message from Doug Anderson]
Signed-off-by: default avatarJavier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 1b976f89
...@@ -3657,9 +3657,11 @@ int regulator_suspend_finish(void) ...@@ -3657,9 +3657,11 @@ int regulator_suspend_finish(void)
list_for_each_entry(rdev, &regulator_list, list) { list_for_each_entry(rdev, &regulator_list, list) {
mutex_lock(&rdev->mutex); mutex_lock(&rdev->mutex);
if (rdev->use_count > 0 || rdev->constraints->always_on) { if (rdev->use_count > 0 || rdev->constraints->always_on) {
error = _regulator_do_enable(rdev); if (!_regulator_is_enabled(rdev)) {
if (error) error = _regulator_do_enable(rdev);
ret = error; if (error)
ret = error;
}
} else { } else {
if (!have_full_constraints()) if (!have_full_constraints())
goto unlock; goto unlock;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment