diff options
| author | Tom Rini <trini@konsulko.com> | 2024-09-02 14:13:57 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-09-02 14:13:57 -0600 |
| commit | 8c069df8dd727bf78426aaa4604750ab93732f04 (patch) | |
| tree | 17ac5bea9d7200864aec9a5f531caed0a3e4e3ec /lib | |
| parent | f0ec3e608902ca1f573e5b7017da6bc804483f55 (diff) | |
| parent | 1312faac5f52d27cfb45dfe1a5a93a2944ca5c21 (diff) | |
Merge tag 'v2024.10-rc4' into next
Prepare v2024.10-rc4
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/Kconfig | 1 | ||||
| -rw-r--r-- | lib/efi_loader/efi_helper.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 1179c31bb13..6ffefa9103f 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -364,7 +364,6 @@ endif config EFI_LOADER_BOUNCE_BUFFER bool "EFI Applications use bounce buffers for DMA operations" - depends on ARM64 help Some hardware does not support DMA to full 64bit addresses. For this hardware we can create a bounce buffer so that payloads don't have to diff --git a/lib/efi_loader/efi_helper.c b/lib/efi_loader/efi_helper.c index 65d2116381a..916f43da26c 100644 --- a/lib/efi_loader/efi_helper.c +++ b/lib/efi_loader/efi_helper.c @@ -74,6 +74,7 @@ out: */ struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t *guid) { + struct efi_device_path *file_path = NULL; struct efi_load_option lo; void *var_value; efi_uintn_t size; @@ -92,11 +93,11 @@ struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t *guid) if (ret != EFI_SUCCESS) goto err; - return efi_dp_from_lo(&lo, guid); + file_path = efi_dp_from_lo(&lo, guid); err: free(var_value); - return NULL; + return file_path; } /** |