diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-11-20 22:28:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-11-20 22:28:23 +0100 |
| commit | a857b530b355a9f2ded091b762207967a9a019f5 (patch) | |
| tree | 07732f6d5245c2f47663dd7c8eda8d41519c0b2b /kernel/power/suspend.c | |
| parent | f384497a76ed9539f70f6e8fe81a193441c943d2 (diff) | |
| parent | 46fc75a29b7034d1971afcbdf47b88926a46b1ea (diff) | |
Merge back material related to system sleep for 6.19
Diffstat (limited to 'kernel/power/suspend.c')
| -rw-r--r-- | kernel/power/suspend.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index b4ca17c2fecf..1c2f777da367 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -344,10 +344,14 @@ MODULE_PARM_DESC(pm_test_delay, static int suspend_test(int level) { #ifdef CONFIG_PM_DEBUG + int i; + if (pm_test_level == level) { pr_info("suspend debug: Waiting for %d second(s).\n", pm_test_delay); - mdelay(pm_test_delay * 1000); + for (i = 0; i < pm_test_delay && !pm_wakeup_pending(); i++) + msleep(1000); + return 1; } #endif /* !CONFIG_PM_DEBUG */ |