diff options
| -rw-r--r-- | arch/arm/mach-imx/imx8/parser.c | 12 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/imx8/parser.c b/arch/arm/mach-imx/imx8/parser.c index 4cef7f0fb3..6c23565636 100644 --- a/arch/arm/mach-imx/imx8/parser.c +++ b/arch/arm/mach-imx/imx8/parser.c @@ -233,14 +233,14 @@ int mmc_load_image_parse_container(struct spl_image_info *spl_image, ret = read_auth_container(spl_image); - if (ret) - return ret; - - /* Images loaded, now check the rpmb keyblob for Trusty OS. */ + if (!ret) + { + /* Images loaded, now check the rpmb keyblob for Trusty OS. */ #if defined(CONFIG_IMX_TRUSTY_OS) - ret = check_rpmb_blob(mmc); - return ret; + ret = check_rpmb_blob(mmc); #endif + } + return ret; } int spi_load_image_parse_container(struct spl_image_info *spl_image, diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index ec56f11fdb..ae59991824 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -112,7 +112,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, #if defined(CONFIG_IMX_TRUSTY_OS) && defined(CONFIG_ANDROID_AUTO_SUPPORT) ret = check_rpmb_blob(mmc); #endif - return 0; + return ret; } #endif /* CONFIG_DUAL_BOOTLOADER */ |