remoteproc: fix error return code in rproc_fw_boot()

Set 'ret' to -EINVAL when needed, so a sensible return value
is returned on errors.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
[fix additional instances of this bug as well, update commit log]
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 022dc635d01e..7e33536b5c2b 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -815,18 +815,17 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
         }
 
         rproc->bootaddr = rproc_get_boot_addr(rproc, fw);
+        ret = -EINVAL;
 
         /* look for the resource table */
         table = rproc_find_rsc_table(rproc, fw, &tablesz);
         if (!table) {
-                ret = -EINVAL;
                 goto clean_up;
         }
 
         /* Verify that resource table in loaded fw is unchanged */
         if (rproc->table_csum != crc32(0, table, tablesz)) {
                 dev_err(dev, "resource checksum failed, fw changed?\n");
-                ret = -EINVAL;
                 goto clean_up;
         }
 
@@ -852,8 +851,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw)
          * copy this information to device memory.
          */
         loaded_table = rproc_find_loaded_rsc_table(rproc, fw);
-        if (!loaded_table)
+        if (!loaded_table) {
+                ret = -EINVAL;
                 goto clean_up;
+        }
 
         memcpy(loaded_table, rproc->cached_table, tablesz);