[PATCH v3] remoteproc/mediatek: unprepare clk if scp_before_load fails
Tzung-Bi Shih
tzungbi at google.com
Thu Dec 3 10:59:14 EST 2020
Fixes the error handling to unprepare clk if scp_before_load fails.
Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP")
Signed-off-by: Tzung-Bi Shih <tzungbi at google.com>
---
Changes from v2[2]:
- fix the "Fixes" tag format
Changes from v1[1]:
- add "Fixes" tag
- remove an unneeded change
[1]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201202044537.2500497-1-tzungbi@google.com/
[2]: https://patchwork.kernel.org/project/linux-remoteproc/patch/20201203030436.3583198-1-tzungbi@google.com/
drivers/remoteproc/mtk_scp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 5f42b9ce7185..5e5705fe35a8 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -350,9 +350,10 @@ static int scp_load(struct rproc *rproc, const struct firmware *fw)
ret = scp->data->scp_before_load(scp);
if (ret < 0)
- return ret;
+ goto leave;
ret = scp_elf_load_segments(rproc, fw);
+leave:
clk_disable_unprepare(scp->clk);
return ret;
--
2.29.2.454.gaff20da3a2-goog
More information about the linux-arm-kernel
mailing list