diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-23 14:17:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-23 14:17:15 -0500 |
| commit | 92f20ff72066d8d7e2ffb655c2236259ac9d1c5d (patch) | |
| tree | f7e5b8ea662a0cae1994e4f6be247b2c33b628dc | |
| parent | ba461afbef604f58e05676ca38c2a599f073f296 (diff) | |
| parent | 202773260023b56e868d09d13d3a417028f1ff5b (diff) | |
| download | linux-92f20ff72066d8d7e2ffb655c2236259ac9d1c5d.tar.bz2 | |
Merge tag 'pm-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"Fix a recent regression preventing some systems from powering off
after saving a hibernation image (Dmitry Osipenko)"
* tag 'pm-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM: hibernate: Use kernel_can_power_off()
| -rw-r--r-- | kernel/power/hibernate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index 20a66bf9f465..89c71fce225d 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c @@ -665,7 +665,7 @@ static void power_down(void) hibernation_platform_enter(); fallthrough; case HIBERNATION_SHUTDOWN: - if (pm_power_off) + if (kernel_can_power_off()) kernel_power_off(); break; } |