| From 30338cf09f82523d8747670f7363cc8af347c79f Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= <sjur.brandeland@stericsson.com> |
| Date: Sun, 10 Jun 2012 14:37:51 +0300 |
| Subject: remoteproc: fix missing fault indication in error-path |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Sjur Brændeland <sjur.brandeland@stericsson.com> |
| |
| 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> |
| |
| --- |
| drivers/remoteproc/remoteproc_core.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/remoteproc/remoteproc_core.c |
| +++ b/drivers/remoteproc/remoteproc_core.c |
| @@ -1041,8 +1041,10 @@ static int rproc_fw_boot(struct rproc *r |
| |
| /* 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); |
