From: AKASHI Takahiro <takahiro.akashi@linaro.org>
Date: Tue, 20 Apr 2021 01:03:16 +0000 (+0900)
Subject: efi_loader: capsule: return a correct error code at find_boot_device()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2c1a6840495eb1ab90c8d5cf7e057f793d84dc16;p=u-boot.git

efi_loader: capsule: return a correct error code at find_boot_device()

In case of failure at efi_get_variable_int("BootOrder"), we should
skip examining boot option variables and return an appropriate error
code which is the one the function returned.

Fixes: CID 331153 Code maintainability issues  (UNUSED_VALUE)
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---

diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index a984c347e1..6ee883d5b1 100644
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@@ -685,7 +685,6 @@ skip:
 		efi_free_pool(boot_dev);
 		boot_dev = NULL;
 	}
-out:
 	if (boot_dev) {
 		u16 *path_str;
 
@@ -703,6 +702,7 @@ out:
 	} else {
 		ret = EFI_NOT_FOUND;
 	}
+out:
 	free(boot_order);
 
 	return ret;