diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-31 17:24:19 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-31 17:24:19 -0400 |
| commit | 2b18b89156335bf1f0d84f81d3597762bc48c61d (patch) | |
| tree | 544e93c39bfaeff20b2ac47980de27edf1a585e4 /lib/efi_loader/efi_memory.c | |
| parent | 779e6dc6a429ac28dfd4f07ab0c3648a31399d4a (diff) | |
| parent | ac28e59a574dd231a4787752d923f618587e3d10 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-usb into next
Diffstat (limited to 'lib/efi_loader/efi_memory.c')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 89adf203102..97d90f069a6 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -627,18 +627,18 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, *memory_map_size = map_size; - if (provided_map_size < map_size) - return EFI_BUFFER_TOO_SMALL; - - if (!memory_map) - return EFI_INVALID_PARAMETER; - if (descriptor_size) *descriptor_size = sizeof(struct efi_mem_desc); if (descriptor_version) *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; + if (provided_map_size < map_size) + return EFI_BUFFER_TOO_SMALL; + + if (!memory_map) + return EFI_INVALID_PARAMETER; + /* Copy list into array */ /* Return the list in ascending order */ memory_map = &memory_map[map_entries - 1]; |