summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2022-02-28 14:05:32 -0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-01 18:51:11 +0100
commitba7ffcd4c4da374b0f64666354eeeda7d3827131 (patch)
treebc20ecb6ad428773c0d2b60b5d401d951db41b1c /kernel/power
parent444e1154b2bf0b881b65ba1bba5bc8e691fac04a (diff)
PM: hibernate: fix __setup handler error handling
If an invalid value is used in "resumedelay=<seconds>", it is silently ignored. Add a warning message and then let the __setup handler return 1 to indicate that the kernel command line option has been handled. Fixes: 317cf7e5e85e3 ("PM / hibernate: convert simple_strtoul to kstrtoul") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru> Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/hibernate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 49d1df0218cb..0ac805b753e5 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1330,7 +1330,7 @@ static int __init resumedelay_setup(char *str)
int rc = kstrtouint(str, 0, &resume_delay);
if (rc)
- return rc;
+ pr_warn("resumedelay: bad option string '%s'\n", str);
return 1;
}