diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-16 11:57:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-16 11:57:46 -0700 |
| commit | a46310bfae94cfadf3d28a4d97b71e3e4dcc954c (patch) | |
| tree | b0dd528648fcfb6dac3742930af6fcd7dee54b72 | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
| parent | efi: fix return value of __setup handlers (diff) | |
| download | linux-dev-a46310bfae94cfadf3d28a4d97b71e3e4dcc954c.tar.xz linux-dev-a46310bfae94cfadf3d28a4d97b71e3e4dcc954c.zip | |
Merge tag 'efi-urgent-for-v5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fix from Ard Biesheuvel:
"Avoid spurious warnings about unknown boot parameters"
* tag 'efi-urgent-for-v5.17-3' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: fix return value of __setup handlers
| -rw-r--r-- | drivers/firmware/efi/apple-properties.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/apple-properties.c b/drivers/firmware/efi/apple-properties.c index 4c3201e290e2..ea84108035eb 100644 --- a/drivers/firmware/efi/apple-properties.c +++ b/drivers/firmware/efi/apple-properties.c @@ -24,7 +24,7 @@ static bool dump_properties __initdata; static int __init dump_properties_enable(char *arg) { dump_properties = true; - return 0; + return 1; } __setup("dump_apple_properties", dump_properties_enable); diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 7de3f5b6e8d0..5502e176d51b 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -212,7 +212,7 @@ static int __init efivar_ssdt_setup(char *str) memcpy(efivar_ssdt, str, strlen(str)); else pr_warn("efivar_ssdt: name too long: %s\n", str); - return 0; + return 1; } __setup("efivar_ssdt=", efivar_ssdt_setup); |