diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-03 10:17:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-04-03 10:17:48 -0700 |
| commit | 5dee87215b2c539e7b82704d56f610a4e558b9cc (patch) | |
| tree | 5aec67e413370ab7107327538e5a1852c835aeba /arch/arm/mach-s3c | |
| parent | be2d3ecedd9911fbfd7e55cc9ceac5f8b79ae4cf (diff) | |
| parent | de4fb176622d54a82ea3ceb7362392aaf5ff0b5a (diff) | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- avoid unnecessary rebuilds for library objects
- fix return value of __setup handlers
- fix invalid input check for "crashkernel=" kernel option
- silence KASAN warnings in unwind_frame
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
ARM: 9190/1: kdump: add invalid input check for 'crashkernel=0'
ARM: 9187/1: JIVE: fix return value of __setup handler
ARM: 9189/1: decompressor: fix unneeded rebuilds of library objects
Diffstat (limited to 'arch/arm/mach-s3c')
| -rw-r--r-- | arch/arm/mach-s3c/mach-jive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c/mach-jive.c b/arch/arm/mach-s3c/mach-jive.c index 285e1f0f4145..0d7d408c3729 100644 --- 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 *options) 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) { @@ -256,7 +256,7 @@ static int __init jive_mtdset(char *options) "using default.", set); } - return 0; + return 1; } /* parse the mtdset= option given to the kernel command line */ |