mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-04-29 01:09:33 -04:00
efi/libstub: Simplify efi_get_memory_map()
Do not check the value of status twice. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Link: https://lore.kernel.org/r/20200216184050.3100-1-xypron.glpk@gmx.de Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
committed by
Ard Biesheuvel
parent
eaa6fc67e1
commit
e7ea37b00d
@@ -52,13 +52,14 @@ efi_status_t efi_get_memory_map(struct efi_boot_memmap *map)
|
||||
goto again;
|
||||
}
|
||||
|
||||
if (status != EFI_SUCCESS)
|
||||
if (status == EFI_SUCCESS) {
|
||||
if (map->key_ptr)
|
||||
*map->key_ptr = key;
|
||||
if (map->desc_ver)
|
||||
*map->desc_ver = desc_version;
|
||||
} else {
|
||||
efi_bs_call(free_pool, m);
|
||||
|
||||
if (map->key_ptr && status == EFI_SUCCESS)
|
||||
*map->key_ptr = key;
|
||||
if (map->desc_ver && status == EFI_SUCCESS)
|
||||
*map->desc_ver = desc_version;
|
||||
}
|
||||
|
||||
fail:
|
||||
*map->map = m;
|
||||
|
||||
Reference in New Issue
Block a user