diff options
| author | Tom Rini <trini@konsulko.com> | 2022-10-10 12:14:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-10 12:14:51 -0400 |
| commit | 2877e9ddca83180ec1e3567f6bab3ffc380e0b60 (patch) | |
| tree | def195bf5f248d3950a9e6154567b4bf4c131e29 /lib/efi_loader/efi_load_options.c | |
| parent | 73e741b8ee46eba4e02a3bcc758dbd70540ed3c1 (diff) | |
| parent | 21c4d7c5dddf7f51a4b8c11f94b8126278ff662e (diff) | |
Merge tag 'efi-2023-01-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc1-2
Documentation:
* man-page for cls command
* update build requirements
UEFI
* Fix bugs in the Stop() function of the EFi Driver Binding protocol
for block devices
* Avoid EFI_CALL() when invoking CloseProtocol()
Diffstat (limited to 'lib/efi_loader/efi_load_options.c')
| -rw-r--r-- | lib/efi_loader/efi_load_options.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/efi_loader/efi_load_options.c b/lib/efi_loader/efi_load_options.c index 71454f0fc66..3cfddee014e 100644 --- a/lib/efi_loader/efi_load_options.c +++ b/lib/efi_loader/efi_load_options.c @@ -27,23 +27,18 @@ efi_status_t efi_set_load_options(efi_handle_t handle, void *load_options) { struct efi_loaded_image *loaded_image_info; + struct efi_handler *handler; efi_status_t ret; - ret = EFI_CALL(systab.boottime->open_protocol( - handle, - &efi_guid_loaded_image, - (void **)&loaded_image_info, - efi_root, NULL, - EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL)); + ret = efi_search_protocol(handle, &efi_guid_loaded_image, &handler); + loaded_image_info = handler->protocol_interface; if (ret != EFI_SUCCESS) return EFI_INVALID_PARAMETER; loaded_image_info->load_options = load_options; loaded_image_info->load_options_size = load_options_size; - return EFI_CALL(systab.boottime->close_protocol(handle, - &efi_guid_loaded_image, - efi_root, NULL)); + return EFI_SUCCESS; } /** |