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

torvalds · torvalds · commit 87cf461cd30b · 2025-07-11T09:19:33.000-07:00
Pull power management fix from Rafael Wysocki:
 "Fix a coding mistake in a previous fix related to system suspend and
  hibernation merged recently"

* tag 'pm-6.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: sleep: Call pm_restore_gfp_mask() after dpm_resume()
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
@@ -1236,8 +1236,8 @@ void dpm_complete(pm_message_t state)
  */
 void dpm_resume_end(pm_message_t state)
 {
-	pm_restore_gfp_mask();
 	dpm_resume(state);
+	pm_restore_gfp_mask();
 	dpm_complete(state);
 }
 EXPORT_SYMBOL_GPL(dpm_resume_end);

Original file line number	Diff line number	Diff line change
`@@ -1236,8 +1236,8 @@ void dpm_complete(pm_message_t state)`
`1236`	`1236`	`*/`
`1237`	`1237`	`void dpm_resume_end(pm_message_t state)`
`1238`	`1238`	`{`
`1239`		`- pm_restore_gfp_mask();`
`1240`	`1239`	`dpm_resume(state);`
	`1240`	`+ pm_restore_gfp_mask();`
`1241`	`1241`	`dpm_complete(state);`
`1242`	`1242`	`}`
`1243`	`1243`	`EXPORT_SYMBOL_GPL(dpm_resume_end);`