lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 047/563] drm/rockchip: dsi: Fix unbalanced clock on probe error
    Date
    From: Brian Norris <briannorris@chromium.org>

    [ Upstream commit 251888398753924059f3bb247a44153a2853137f ]

    Our probe() function never enabled this clock, so we shouldn't disable
    it if we fail to probe the bridge.

    Noted by inspection.

    Fixes: 2d4f7bdafd70 ("drm/rockchip: dsi: migrate to use dw-mipi-dsi bridge driver")
    Signed-off-by: Brian Norris <briannorris@chromium.org>
    Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
    Tested-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/20210928143413.v3.3.Ie8ceefb51ab6065a1151869b6fcda41a467d4d2c@changeid
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
    index d0c9610ad2202..433b2f459a7d9 100644
    --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
    @@ -1126,14 +1126,10 @@ static int dw_mipi_dsi_rockchip_probe(struct platform_device *pdev)
    if (ret != -EPROBE_DEFER)
    DRM_DEV_ERROR(dev,
    "Failed to probe dw_mipi_dsi: %d\n", ret);
    - goto err_clkdisable;
    + return ret;
    }

    return 0;
    -
    -err_clkdisable:
    - clk_disable_unprepare(dsi->pllref_clk);
    - return ret;
    }

    static int dw_mipi_dsi_rockchip_remove(struct platform_device *pdev)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 20:55    [W:4.292 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site