diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 16:17:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 16:17:07 -0500 |
| commit | ffefb181728f7b97df49ceba18cacfb6c5ee19f2 (patch) | |
| tree | 2cf8c885b05df032faed718f9e7004c886e8eae1 | |
| parent | c3611b6d7fd7944bebf0ae45cdb4d47288e394b4 (diff) | |
| parent | 57a0dd187956ea04870f4bbbf25a63c425ee7cad (diff) | |
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
| -rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 42681c10cbe4..dd4708c58480 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -758,7 +758,7 @@ static int suspend_set_state(struct regulator_dev *rdev, | |||
| 758 | 758 | ||
| 759 | rstate = regulator_get_suspend_state(rdev, state); | 759 | rstate = regulator_get_suspend_state(rdev, state); |
| 760 | if (rstate == NULL) | 760 | if (rstate == NULL) |
| 761 | return -EINVAL; | 761 | return 0; |
| 762 | 762 | ||
| 763 | /* If we have no suspend mode configration don't set anything; | 763 | /* If we have no suspend mode configration don't set anything; |
| 764 | * only warn if the driver implements set_suspend_voltage or | 764 | * only warn if the driver implements set_suspend_voltage or |