summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@sonymobile.com>2016-03-29 05:36:58 +0200
committerBjorn Andersson <bjorn.andersson@linaro.org>2016-05-13 00:50:04 +0200
commite395f9ce49eb5a9fa69c3fd74b6de59a5cb5a300 (patch)
tree4c7d4e9f0714cf60e03558ebfc1f0b8b58b056f4
parentremoteproc: core: Task sync during rproc_fw_boot() (diff)
downloadlinux-e395f9ce49eb5a9fa69c3fd74b6de59a5cb5a300.tar.xz
linux-e395f9ce49eb5a9fa69c3fd74b6de59a5cb5a300.zip
remoteproc: core: Make the loaded resource table optional
Remote processors like the ones found in the Qualcomm SoCs does not have a resource table passed to them, so make it optional by only populating it if it does exist. Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-rw-r--r--drivers/remoteproc/remoteproc_core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
index 1210d6db40b1..31dfc9996389 100644
--- a/drivers/remoteproc/remoteproc_core.c
+++ b/drivers/remoteproc/remoteproc_core.c
@@ -856,12 +856,8 @@ 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) {
- ret = -EINVAL;
- goto clean_up;
- }
-
- memcpy(loaded_table, rproc->cached_table, tablesz);
+ if (loaded_table)
+ memcpy(loaded_table, rproc->cached_table, tablesz);
/* power up the remote processor */
ret = rproc->ops->start(rproc);