From c630e0ad3bc87f962ba7ce6038a78d99b9d1ff5c Mon Sep 17 00:00:00 2001 From: "faqiang.zhu" Date: Wed, 28 Nov 2018 11:01:27 +0800 Subject: [PATCH] MA-13588 Fix build warning caused by previous android SPL+CONTAINER patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit compile waring info is as below: arch/arm/mach-imx/imx8/parser.c: In function ‘mmc_load_image_parse_container’: arch/arm/mach-imx/imx8/parser.c:244:1: warning: control reaches end of non-void function [-Wreturn-type] } ^ previouse patch change ID: I40a791d5b5b1eba6a0170d6853626fb546be4b2c Change-Id: Ia605df11beab42e720fff6442a11b1e4b25ac209 Signed-off-by: faqiang.zhu --- arch/arm/mach-imx/imx8/parser.c | 12 ++++++------ 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 4cef7f0..6c23565 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 ec56f11..ae59991 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 */ -- 1.9.1