lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 0490/1157] drm/exynos/exynos7_drm_decon: free resources when clk_set_parent() failed.
    Date
    From: Jian Zhang <zhangjian210@huawei.com>

    [ Upstream commit 48b927770f8ad3f8cf4a024a552abf272af9f592 ]

    In exynos7_decon_resume, When it fails, we must use clk_disable_unprepare()
    to free resource that have been used.

    Fixes: 6f83d20838c09 ("drm/exynos: use DRM_DEV_ERROR to print out error
    message")
    Reported-by: Hulk Robot <hulkci@huawei.com>
    Signed-off-by: Jian Zhang <zhangjian210@huawei.com>
    Signed-off-by: Inki Dae <inki.dae@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/exynos/exynos7_drm_decon.c | 17 +++++++++++++----
    1 file changed, 13 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
    index c04264f70ad1..3c31405600f0 100644
    --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
    +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
    @@ -800,31 +800,40 @@ static int exynos7_decon_resume(struct device *dev)
    if (ret < 0) {
    DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n",
    ret);
    - return ret;
    + goto err_pclk_enable;
    }

    ret = clk_prepare_enable(ctx->aclk);
    if (ret < 0) {
    DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n",
    ret);
    - return ret;
    + goto err_aclk_enable;
    }

    ret = clk_prepare_enable(ctx->eclk);
    if (ret < 0) {
    DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n",
    ret);
    - return ret;
    + goto err_eclk_enable;
    }

    ret = clk_prepare_enable(ctx->vclk);
    if (ret < 0) {
    DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n",
    ret);
    - return ret;
    + goto err_vclk_enable;
    }

    return 0;
    +
    +err_vclk_enable:
    + clk_disable_unprepare(ctx->eclk);
    +err_eclk_enable:
    + clk_disable_unprepare(ctx->aclk);
    +err_aclk_enable:
    + clk_disable_unprepare(ctx->pclk);
    +err_pclk_enable:
    + return ret;
    }
    #endif

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:57    [W:4.023 / U:0.876 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site