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>

diff --git a/drivers/firmware/efi/libstub/mem.c b/drivers/firmware/efi/libstub/mem.c
index 17060086913a65468e10c06cc62ac1605cfed890..2499e04850818b3595d7b8a33f91316fc24c26b2 100644 (file)
--- a/drivers/firmware/efi/libstub/mem.c
+++ b/drivers/firmware/efi/libstub/mem.c
@@ -52,13 +52,14 @@ again:
                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;