diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2012-06-10 14:37:51 +0300 |
|---|---|---|
| committer | Ohad Ben-Cohen <ohad@wizery.com> | 2012-06-10 14:49:46 +0300 |
| commit | 30338cf09f82523d8747670f7363cc8af347c79f (patch) | |
| tree | 3a2c824ce909edfcb7a8b5899829699a0618333a /drivers/remoteproc | |
| parent | e981f6d41acda2ae8c05e60feb2cb97772b4a6e6 (diff) | |
| download | blackbird-op-linux-30338cf09f82523d8747670f7363cc8af347c79f.tar.gz blackbird-op-linux-30338cf09f82523d8747670f7363cc8af347c79f.zip | |
remoteproc: fix missing fault indication in error-path
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/remoteproc')
| -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 cb13f1b74416..66324ee4678f 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); |
