PM: hibernate: fix __setup handler error handling
[ Upstream commitba7ffcd4c4
] 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:317cf7e5e8
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
efaa0e9692
commit
d0cd9da501
@ -1326,7 +1326,7 @@ static int __init resumedelay_setup(char *str)
|
|||||||
int rc = kstrtouint(str, 0, &resume_delay);
|
int rc = kstrtouint(str, 0, &resume_delay);
|
||||||
|
|
||||||
if (rc)
|
if (rc)
|
||||||
return rc;
|
pr_warn("resumedelay: bad option string '%s'\n", str);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user