Skip to content

Commit

Permalink
Merge tag 'regulator-fix-v4.16-suspend' of git://git.kernel.org/pub/s…
Browse files Browse the repository at this point in the history
…cm/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
  • Loading branch information
Linus Torvalds committed Feb 7, 2018
2 parents c3611b6 + 57a0dd1 commit ffefb18
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 @@ -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
Expand Down

0 comments on commit ffefb18

Please sign in to comment.