lkml.org 
[lkml]   [2020]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.8 023/177] drm/sun4i: add missing put_device() call in sun8i_r40_tcon_tv_set_mux()
    Date
    From: Yu Kuai <yukuai3@huawei.com>

    [ Upstream commit 07b5b12d97dc9f47ff3dff46c4f944a15bd762e5 ]

    If sun8i_r40_tcon_tv_set_mux() succeed, sun8i_r40_tcon_tv_set_mux()
    doesn't have a corresponding put_device(). Thus add put_device()
    to fix the exception handling for this function implementation.

    Fixes: 0305189afb32 ("drm/sun4i: tcon: Add support for R40 TCON")
    Signed-off-by: Yu Kuai <yukuai3@huawei.com>
    Signed-off-by: Maxime Ripard <maxime@cerno.tech>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200826010826.1785487-1-yukuai3@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/sun4i/sun4i_tcon.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
    index 359b56e43b83c..24d95f058918c 100644
    --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c
    +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
    @@ -1433,14 +1433,18 @@ static int sun8i_r40_tcon_tv_set_mux(struct sun4i_tcon *tcon,
    if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP) &&
    encoder->encoder_type == DRM_MODE_ENCODER_TMDS) {
    ret = sun8i_tcon_top_set_hdmi_src(&pdev->dev, id);
    - if (ret)
    + if (ret) {
    + put_device(&pdev->dev);
    return ret;
    + }
    }

    if (IS_ENABLED(CONFIG_DRM_SUN8I_TCON_TOP)) {
    ret = sun8i_tcon_top_de_config(&pdev->dev, tcon->id, id);
    - if (ret)
    + if (ret) {
    + put_device(&pdev->dev);
    return ret;
    + }
    }

    return 0;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-09-16 01:44    [W:4.284 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site