summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSibi Sankar <sibis@codeaurora.org>2018-04-17 22:44:15 +0300
committerBjorn Andersson <bjorn.andersson@linaro.org>2018-04-18 00:41:00 +0300
commit2724807f7f70a6a3e67b3f6bf921cc77ed39c8a1 (patch)
treef07f36234737141ca027b77e4508f7568f95c978 /drivers
parent60cc43fc888428bb2f18f08997432d426a243338 (diff)
downloadlinux-2724807f7f70a6a3e67b3f6bf921cc77ed39c8a1.tar.xz
remoteproc: Prevent incorrect rproc state on xfer mem ownership failure
Any failure in the secure call for transferring mem ownership of mba region to Q6 would result in reporting that the remoteproc device is running. This is because the previous q6v5_clk_enable would have been a success. Prevent this by updating variable 'ret' accordingly. Cc: stable@vger.kernel.org Signed-off-by: Sibi Sankar <sibis@codeaurora.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/remoteproc/qcom_q6v5_pil.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 8e70a627e0bb..8d4a2eb3736e 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -761,13 +761,11 @@ static int q6v5_start(struct rproc *rproc)
}
/* Assign MBA image access in DDR to q6 */
- xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, true,
- qproc->mba_phys,
- qproc->mba_size);
- if (xfermemop_ret) {
+ ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, true,
+ qproc->mba_phys, qproc->mba_size);
+ if (ret) {
dev_err(qproc->dev,
- "assigning Q6 access to mba memory failed: %d\n",
- xfermemop_ret);
+ "assigning Q6 access to mba memory failed: %d\n", ret);
goto disable_active_clks;
}