summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/core.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2018-02-13 10:37:59 +0100
committerMark Brown <broonie@kernel.org>2018-02-20 12:37:43 +0000
commit35b5f14ec6dab281346a2d0ceb34abe2dba94190 (patch)
tree72838b961138e8eed601ff2ba40824d0d2724a87 /drivers/regulator/core.c
parent7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff)
downloadop-kernel-dev-35b5f14ec6dab281346a2d0ceb34abe2dba94190.zip
op-kernel-dev-35b5f14ec6dab281346a2d0ceb34abe2dba94190.tar.gz
regulator: Fix resume from suspend to idle
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 57a0dd187956ea04 ("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>
Diffstat (limited to 'drivers/regulator/core.c')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index dd4708c..1fc0c08 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -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);
OpenPOWER on IntegriCloud