| commit | 92d4c21e51fc12736c39c2a161a42f20e2be8a00 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Tue Dec 06 15:05:30 2022 +0100 |
| tree | 0ea63b023a85dff7aeb0895b46d3b22a65669ae1 | |
| parent | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 [diff] [blame] |
Update Linux to v5.10.157 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.157.tar.xz Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> Change-Id: I7b30d9e98d8c465d6b44de8e7433b4a40b3289ba
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index bf640fd..59a1b12 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c
@@ -637,7 +637,7 @@ int error; if (hibernation_mode == HIBERNATION_SUSPEND) { - error = suspend_devices_and_enter(PM_SUSPEND_MEM); + error = suspend_devices_and_enter(mem_sleep_current); if (error) { hibernation_mode = hibernation_ops ? HIBERNATION_PLATFORM : @@ -1323,7 +1323,7 @@ int rc = kstrtouint(str, 0, &resume_delay); if (rc) - return rc; + pr_warn("resumedelay: bad option string '%s'\n", str); return 1; }