Commit bbbc7210 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.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 that affects system suspend testing
  at the 'core' level (Rafael Wysocki)"

* tag 'pm-6.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: sleep: Fix suspend_test() at the TEST_CORE level
parents dec1ecf2 684d3b26

kernel/power/suspend.c

+6 −3
Original line number Diff line number Diff line
@@ -349,9 +349,12 @@ static int suspend_test(int level) 
	if (pm_test_level == level) {

		pr_info("suspend debug: Waiting for %d second(s).\n",

				pm_test_delay);

		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++)

		for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) {

			if (level > TEST_CORE)

				msleep(1000);



			else

				mdelay(1000);

		}

		return 1;

	}

#endif /* !CONFIG_PM_DEBUG */