Commit a46310bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d34c5824 9feaf8b3

drivers/firmware/efi/apple-properties.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/firmware/efi/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);