lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 405/717] remoteproc/mediatek: unprepare clk if scp_before_load fails
    Date
    From: Tzung-Bi Shih <tzungbi@google.com>

    [ Upstream commit 22c3df6f5574c8d401ea431c7ce24e7c5c5e7ef3 ]

    Fixes the error handling to unprepare clk if scp_before_load fails.

    Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
    Fixes: fd0b6c1ff85a ("remoteproc/mediatek: Add support for mt8192 SCP")
    Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
    Link: https://lore.kernel.org/r/20201203155914.3844426-1-tzungbi@google.com
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 f74f22d4d1ffc..52fa01d67c18e 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.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:4.197 / U:1.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site