diff mbox series

[1/1] efi/libstub: simplify efi_get_memory_map()

Message ID 20200216184050.3100-1-xypron.glpk@gmx.de
State New
Headers show
Series [1/1] efi/libstub: simplify efi_get_memory_map() | expand

Commit Message

Heinrich Schuchardt Feb. 16, 2020, 6:40 p.m. UTC 
Do not check the value of status twice.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
 drivers/firmware/efi/libstub/mem.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

--
2.25.0
diff mbox series

Patch

diff --git a/drivers/firmware/efi/libstub/mem.c b/drivers/firmware/efi/libstub/mem.c
index c6a784ed640f..c25fd9174b74 100644
--- a/drivers/firmware/efi/libstub/mem.c
+++ b/drivers/firmware/efi/libstub/mem.c
@@ -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;