From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> commit 8b2360c7157b462c4870d447d1e65d30ef31f9aa upstream. __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) argument or environment strings. Also, error return codes don't mean anything to obsolete_checksetup() -- only non-zero (usually 1) or zero. So return 1 from jive_mtdset(). Fixes: 9db829f485c5 ("[ARM] JIVE: Initial machine support for Logitech Jive") Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> Cc: Ben Dooks <ben-linux@xxxxxxxxx> Cc: Krzysztof Kozlowski <krzk@xxxxxxxxxx> Cc: Alim Akhtar <alim.akhtar@xxxxxxxxxxx> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx Cc: linux-samsung-soc@xxxxxxxxxxxxxxx Cc: patches@xxxxxxxxxxxxxxx Signed-off-by: Russell King (Oracle) <rmk+kernel@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/arm/mach-s3c/mach-jive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/arch/arm/mach-s3c/mach-jive.c +++ b/arch/arm/mach-s3c/mach-jive.c @@ -236,11 +236,11 @@ static int __init jive_mtdset(char *opti unsigned long set; if (options == NULL || options[0] == '\0') - return 0; + return 1; if (kstrtoul(options, 10, &set)) { printk(KERN_ERR "failed to parse mtdset=%s\n", options); - return 0; + return 1; } switch (set) { @@ -255,7 +255,7 @@ static int __init jive_mtdset(char *opti "using default.", set); } - return 0; + return 1; } /* parse the mtdset= option given to the kernel command line */ Patches currently in stable-queue which might be from rdunlap@xxxxxxxxxxxxx are queue-5.10/tomoyo-fix-__setup-handlers-return-values.patch queue-5.10/evm-fix-the-evm-__setup-handler-return-value.patch queue-5.10/mm-mmap-return-1-from-stack_guard_gap-__setup-handler.patch queue-5.10/tty-hvc-fix-return-value-of-__setup-handler.patch queue-5.10/pm-suspend-fix-return-value-of-__setup-handler.patch queue-5.10/clocksource-acpi_pm-fix-return-value-of-__setup-hand.patch queue-5.10/mips-rb532-fix-return-value-of-__setup-handler.patch queue-5.10/acpi-apei-fix-return-value-of-__setup-handlers.patch queue-5.10/dma-debug-fix-return-value-of-__setup-handlers.patch queue-5.10/hv-utils-add-ptp_1588_clock-to-kconfig-to-fix-build.patch queue-5.10/m68k-coldfire-device.c-only-build-for-mcf_edma-when-.patch queue-5.10/printk-fix-return-value-of-printk.devkmsg-__setup-ha.patch queue-5.10/mips-dec-honor-config_mips_fp_support-n.patch queue-5.10/pm-hibernate-fix-__setup-handler-error-handling.patch queue-5.10/kgdboc-fix-return-value-of-__setup-handler.patch queue-5.10/mm-memcontrol-return-1-from-cgroup.memory-__setup-handler.patch queue-5.10/driver-core-dd-fix-return-value-of-__setup-handler.patch queue-5.10/kgdbts-fix-return-value-of-__setup-handler.patch queue-5.10/mm-usercopy-return-1-from-hardened_usercopy-__setup-handler.patch queue-5.10/arm-9187-1-jive-fix-return-value-of-__setup-handler.patch