]> git.karo-electronics.de Git - linux-beck.git/commitdiff
efi/arm64: Avoid EFI_ERROR as a generic return code
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 2 Jul 2014 12:54:39 +0000 (14:54 +0200)
committerMatt Fleming <matt.fleming@intel.com>
Mon, 7 Jul 2014 19:29:46 +0000 (20:29 +0100)
As EFI_ERROR is not a UEFI result code but a local invention only
intended to allow get_dram_base() to signal failure, we should not use
it elsewhere.

Replace with EFI_LOAD_ERROR.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
arch/arm64/kernel/efi-stub.c

index e786e6cdc400df422984bb0c17f93aacc6cb42ed..7aa7155a9740ef50e4e11eb925c0f18831c3db2a 100644 (file)
@@ -69,7 +69,7 @@ static efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
                if (*image_addr != (dram_base + TEXT_OFFSET)) {
                        pr_efi_err(sys_table, "Failed to alloc kernel memory\n");
                        efi_free(sys_table, kernel_memsize, *image_addr);
-                       return EFI_ERROR;
+                       return EFI_LOAD_ERROR;
                }
                *image_size = kernel_memsize;
        }