diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
commit | 054838bc019c90511d034fb796dc8c7715460fc2 (patch) | |
tree | a04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /drivers/firmware/efi/libstub/secureboot.c | |
parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
parent | fc69910f329d61821897871e0e957eda39beb3d8 (diff) |
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'drivers/firmware/efi/libstub/secureboot.c')
-rw-r--r-- | drivers/firmware/efi/libstub/secureboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 6def402bf569..5da36e56b36a 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -45,6 +45,8 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) size = sizeof(secboot); status = get_efi_var(efi_SecureBoot_name, &efi_variable_guid, NULL, &size, &secboot); + if (status == EFI_NOT_FOUND) + return efi_secureboot_mode_disabled; if (status != EFI_SUCCESS) goto out_efi_err; @@ -78,7 +80,5 @@ secure_boot_enabled: out_efi_err: pr_efi_err(sys_table_arg, "Could not determine UEFI Secure Boot status.\n"); - if (status == EFI_NOT_FOUND) - return efi_secureboot_mode_disabled; return efi_secureboot_mode_unknown; } |