Commit ffefb181 authored by Linus Torvalds's avatar 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
...@@ -758,7 +758,7 @@ static int suspend_set_state(struct regulator_dev *rdev, ...@@ -758,7 +758,7 @@ static int suspend_set_state(struct regulator_dev *rdev,
rstate = regulator_get_suspend_state(rdev, state); rstate = regulator_get_suspend_state(rdev, state);
if (rstate == NULL) if (rstate == NULL)
return -EINVAL; return 0;
/* If we have no suspend mode configration don't set anything; /* If we have no suspend mode configration don't set anything;
* only warn if the driver implements set_suspend_voltage or * only warn if the driver implements set_suspend_voltage or
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment