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 4.19 071/346] drm/tegra: sor: Disable clocks on error in tegra_sor_init()
    Date
    From: Qinglang Miao <miaoqinglang@huawei.com>

    [ Upstream commit bf3a3cdcad40e5928a22ea0fd200d17fd6d6308d ]

    Fix the missing clk_disable_unprepare() before return from
    tegra_sor_init() in the error handling case.

    Signed-off-by: Qinglang Miao <miaoqinglang@huawei.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/tegra/sor.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
    index 89cb70da2bfe6..83108e2430501 100644
    --- a/drivers/gpu/drm/tegra/sor.c
    +++ b/drivers/gpu/drm/tegra/sor.c
    @@ -2668,17 +2668,23 @@ static int tegra_sor_init(struct host1x_client *client)
    if (err < 0) {
    dev_err(sor->dev, "failed to deassert SOR reset: %d\n",
    err);
    + clk_disable_unprepare(sor->clk);
    return err;
    }
    }

    err = clk_prepare_enable(sor->clk_safe);
    - if (err < 0)
    + if (err < 0) {
    + clk_disable_unprepare(sor->clk);
    return err;
    + }

    err = clk_prepare_enable(sor->clk_dp);
    - if (err < 0)
    + if (err < 0) {
    + clk_disable_unprepare(sor->clk_safe);
    + clk_disable_unprepare(sor->clk);
    return err;
    + }

    return 0;
    }
    --
    2.27.0


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