Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f214563 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

drm/rockchip: Fix an error handling path rockchip_dp_probe() 



[ 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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/b719d9061bb97eb85145fbd3c5e63f4549f2e13e.1655572071.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3345fd35

drivers/gpu/drm/rockchip/analogix_dp-rockchip.c

+9 −1
Original line number Diff line number Diff line
@@ -401,7 +401,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)