Commit ffefb181 authored Feb 07, 2018 by Linus Torvalds

Merge tag 'regulator-fix-v4.16-suspend' of...

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

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

parents c3611b6d 57a0dd18

drivers/regulator/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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