diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
| commit | 38b587878eee8f9f2664135ab76805d0510bb997 (patch) | |
| tree | 66f5c8eb8821dc7fa1fe91741b24ff7291ef3bf1 /drivers/acpi/sleep.c | |
| parent | 323174b55ef1de0c70ed0b268fcaf9f2d6f842c6 (diff) | |
| parent | 24f70aa804cd7f8fee4353cf4990997d1c8375ae (diff) | |
Merge tag 'v4.9.90' into linux-linaro-lsk-v4.9lsk-v4.9-18.03
This is the 4.9.90 stable release
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index a4327af676fe..097d630ab886 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -474,6 +474,7 @@ static void acpi_pm_start(u32 acpi_state) */ static void acpi_pm_end(void) { + acpi_turn_off_unused_power_resources(); acpi_scan_lock_release(); /* * This is necessary in case acpi_pm_finish() is not called during a |