diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2012-06-10 14:37:51 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 11:37:16 -0700 |
| commit | 6582db31eb1e89ef6b08242a16a781849dada810 (patch) | |
| tree | dc7e5442319fb9455ef7fae8bfcc3385262efaa0 | |
| parent | d186a40464141d201f93ee87e0be6f0d2ef029d6 (diff) | |
| download | kernel-common-6582db31eb1e89ef6b08242a16a781849dada810.tar.gz kernel-common-6582db31eb1e89ef6b08242a16a781849dada810.tar.bz2 kernel-common-6582db31eb1e89ef6b08242a16a781849dada810.zip | |
remoteproc: fix missing fault indication in error-path
commit 30338cf09f82523d8747670f7363cc8af347c79f upstream.
If rproc_find_rsc_table() fails, rproc_fw_boot() must set
return-value before jumping to clean_up label. Otherwise no
error value is returned.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/remoteproc/remoteproc_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 6957c963dc93..7591b9774d05 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *rproc, const struct firmware *fw) /* look for the resource table */ table = rproc_find_rsc_table(rproc, fw->data, fw->size, &tablesz); - if (!table) + if (!table) { + ret = -EINVAL; goto clean_up; + } /* handle fw resources which are required to boot rproc */ ret = rproc_handle_boot_rsc(rproc, table, tablesz); |