diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-11-17 16:55:55 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-11-17 16:55:55 +0100 |
| commit | 37d6d92fe0859f72a25f91f875efa6feb676de68 (patch) | |
| tree | 72d522e98148b9c8c1fbd7fb8564d3df0c0c2902 /kernel/power/suspend.c | |
| parent | 0b6c10cb8479d0d1b7b208277df2e2afe082d4bd (diff) | |
| parent | a10ad1b104024efe0a01d21ce7c08002cf4034c4 (diff) | |
Merge back earlier 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 */ |