Merge tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

ffefb181 · Linus Torvalds <[email protected]> · 2018-02-07 13:17:07 -08:00

Pull regulator fix from Mark Brown:
 "Fix suspend to idle.

  Testing on mainline after the initial regulator pull request went in
  identified a regression for suspend to idle due to it calling the
  suspend operations with states that it wasn't realized could happen,
  this patch fixes the problem"

* tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Fix suspend to idle

Commit: ffefb181728f7b97df49ceba18cacfb6c5ee19f2
Parents: c3611b6d · 57a0dd18

Merge commit. Changes below are compared with the first parent: c3611b6d.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/regulator/core.c	modified	+1	−1	View file

drivers/regulator/core.c

View file

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 42681c1..dd4708c 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -758,7 +758,7 @@ static int suspend_set_state(struct regulator_dev *rdev,
 
 	rstate = regulator_get_suspend_state(rdev, state);
 	if (rstate == NULL)
-		return -EINVAL;
+		return 0;
 
 	/* If we have no suspend mode configration don't set anything;
 	 * only warn if the driver implements set_suspend_voltage or