Skip to content

Commit

Permalink
regulator: Fix resume from suspend to idle
Browse files Browse the repository at this point in the history
When resuming from idle with the new suspend mode configuration support
we go through the resume callbacks with a state of PM_SUSPEND_TO_IDLE
which we don't have regulator constraints for, causing an error:

    dpm_run_callback(): regulator_resume_early+0x0/0x64 returns -22
    PM: Device regulator.0 failed to resume early: error -22

Avoid this and similar errors by treating missing constraints as a noop.

See also commit 57a0dd1 ("regulator: Fix suspend to idle"),
which fixed the suspend part.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Geert Uytterhoeven authored and Mark Brown committed Feb 20, 2018
1 parent 7928b2c commit 35b5f14
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/regulator/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4310,7 +4310,7 @@ static int _regulator_resume_early(struct device *dev, void *data)

rstate = regulator_get_suspend_state(rdev, *state);
if (rstate == NULL)
return -EINVAL;
return 0;

mutex_lock(&rdev->mutex);

Expand Down

0 comments on commit 35b5f14

Please sign in to comment.