diff options
| author | faqiang.zhu <faqiang.zhu@nxp.com> | 2018-11-28 11:01:27 +0800 |
|---|---|---|
| committer | faqiang.zhu <faqiang.zhu@nxp.com> | 2018-11-28 13:06:16 +0800 |
| commit | c630e0ad3bc87f962ba7ce6038a78d99b9d1ff5c (patch) | |
| tree | fd05d44d3fce687d8389268b10abf23a8be49904 /arch | |
| parent | cd11afb01f6a6719e909a34e50f88dda1a0360c4 (diff) | |
MA-13588 Fix build warning caused by previous android SPL+CONTAINER patch
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 <faqiang.zhu@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/imx8/parser.c | 12 |
1 files changed, 6 insertions, 6 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, |