Commit e7ea37b0 authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Ard Biesheuvel
Browse files

efi/libstub: Simplify efi_get_memory_map() 



Do not check the value of status twice.

Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Link: https://lore.kernel.org/r/20200216184050.3100-1-xypron.glpk@gmx.de


Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent eaa6fc67

drivers/firmware/efi/libstub/mem.c

+7 −6
Original line number Diff line number Diff line
@@ -52,13 +52,14 @@ again: 
		goto again;

	}



	if (status != EFI_SUCCESS)

		efi_bs_call(free_pool, m);



	if (map->key_ptr && status == EFI_SUCCESS)

	if (status == EFI_SUCCESS) {

		if (map->key_ptr)

			*map->key_ptr = key;

	if (map->desc_ver && status == EFI_SUCCESS)

		if (map->desc_ver)

			*map->desc_ver = desc_version;

	} else {

		efi_bs_call(free_pool, m);

	}



fail:

	*map->map = m;

CRA Git | Maintained and supported by SUSTech CRA and CCSE