mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 06:33:07 +00:00
clocksource: acpi_pm: fix return value of __setup handler
[ Upstream commit6a861abcee
] __setup() handlers should return 1 to obsolete_checksetup() in init/main.c to indicate that the boot option has been handled. A return of 0 causes the boot option/value to be listed as an Unknown kernel parameter and added to init's (limited) environment strings. The __setup() handler interface isn't meant to handle negative return values -- they are non-zero, so they mean "handled" (like a return value of 1 does), but that's just a quirk. So return 1 from parse_pmtmr(). Also print a warning message if kstrtouint() returns an error. Fixes:6b148507d3
("pmtmr: allow command line override of ioport") 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:
parent
e6ee35c475
commit
54aa7c1ea2
1 changed files with 4 additions and 2 deletions
|
@ -230,8 +230,10 @@ static int __init parse_pmtmr(char *arg)
|
|||
int ret;
|
||||
|
||||
ret = kstrtouint(arg, 16, &base);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (ret) {
|
||||
pr_warn("PMTMR: invalid 'pmtmr=' value: '%s'\n", arg);
|
||||
return 1;
|
||||
}
|
||||
|
||||
pr_info("PMTMR IOPort override: 0x%04x -> 0x%04x\n", pmtmr_ioport,
|
||||
base);
|
||||
|
|
Loading…
Reference in a new issue