Commit 92f20ff7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents ba461afb 20277326

kernel/power/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}