Commit ba7ffcd4 authored by Randy Dunlap's avatar Randy Dunlap Committed by Rafael J. Wysocki
Browse files

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: 317cf7e5 ("PM / hibernate: convert simple_strtoul to kstrtoul")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarIgor Zhbanov <i.zhbanov@omprussia.ru>
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@omprussia.ru
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 444e1154

kernel/power/hibernate.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}