Commit 87cf461c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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()
parents a0f8361c ec3cae63

drivers/base/power/main.c

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