Skip to content

Commit

Permalink
drm/rockchip: Fix an error handling path rockchip_dp_probe()
Browse files Browse the repository at this point in the history
[ Upstream commit 5074376 ]

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

Fixes: 152cce0 ("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>
  • Loading branch information
tititiou36 authored and gregkh committed Aug 17, 2022
1 parent 703d706 commit 23b1133
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 23b1133

Please sign in to comment.