Merge tag 'pm-5.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit 92f20ff72066 · 2022-06-23T14:17:15.000-05:00
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()
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -665,7 +665,7 @@ static void power_down(void)`
`665`	`665`	`hibernation_platform_enter();`
`666`	`666`	`fallthrough;`
`667`	`667`	`case HIBERNATION_SHUTDOWN:`
`668`		`- if (pm_power_off)`
	`668`	`+ if (kernel_can_power_off())`
`669`	`669`	`kernel_power_off();`
`670`	`670`	`break;`
`671`	`671`	`}`