diff options
| author | Tom Rini <trini@konsulko.com> | 2023-07-28 12:48:00 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-07-28 12:48:00 -0400 |
| commit | a36d59ba99a19c777d896d4c70e75975654e2831 (patch) | |
| tree | d0b3000aa039ad1085506ddff514c882c67f2701 /lib/efi_driver/efi_uclass.c | |
| parent | 6544943819bdb8258195c0eb5716345dd5bba070 (diff) | |
| parent | 6e8fa0611f19824e200fe4725f18bce7e2000071 (diff) | |
Merge tag 'efi-2023-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-10-rc2
Documentation:
* Update the documentation for TI K3 boards (use SVG images)
* Update doc/sphinx/requirements.txt
* Describe QEMU emulation of block devices
UEFI
* Fix device paths for special block devices
Diffstat (limited to 'lib/efi_driver/efi_uclass.c')
| -rw-r--r-- | lib/efi_driver/efi_uclass.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 45f93519887..66a45e156d6 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -285,10 +285,8 @@ static efi_status_t efi_add_driver(struct driver *drv) bp->ops = ops; ret = efi_create_handle(&bp->bp.driver_binding_handle); - if (ret != EFI_SUCCESS) { - free(bp); - goto out; - } + if (ret != EFI_SUCCESS) + goto err; bp->bp.image_handle = bp->bp.driver_binding_handle; ret = efi_add_protocol(bp->bp.driver_binding_handle, &efi_guid_driver_binding_protocol, bp); @@ -299,11 +297,11 @@ static efi_status_t efi_add_driver(struct driver *drv) if (ret != EFI_SUCCESS) goto err; } -out: - return ret; + return ret; err: - efi_delete_handle(bp->bp.driver_binding_handle); + if (bp->bp.driver_binding_handle) + efi_delete_handle(bp->bp.driver_binding_handle); free(bp); return ret; } |