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.15 313/779] drm/rockchip: Fix an error handling path rockchip_dp_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 5074376822fe99fa4ce344b851c5016d00c0444f ]

    Should component_add() fail, we should call analogix_dp_remove() in the
    error handling path, as already done in the remove function.

    Fixes: 152cce0006ab ("drm/bridge: analogix_dp: Split bind() into probe() and real bind()")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Heiko Stuebner <heiko@sntech.de>
    Link: https://patchwork.freedesktop.org/patch/msgid/b719d9061bb97eb85145fbd3c5e63f4549f2e13e.1655572071.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    index ade2327a10e2..512581698a1e 100644
    --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
    @@ -398,7 +398,15 @@ static int rockchip_dp_probe(struct platform_device *pdev)
    if (IS_ERR(dp->adp))
    return PTR_ERR(dp->adp);

    - return component_add(dev, &rockchip_dp_component_ops);
    + ret = component_add(dev, &rockchip_dp_component_ops);
    + if (ret)
    + goto err_dp_remove;
    +
    + return 0;
    +
    +err_dp_remove:
    + analogix_dp_remove(dp->adp);
    + return ret;
    }

    static int rockchip_dp_remove(struct platform_device *pdev)
    --
    2.35.1


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