Commit e8083acc authored by Liu Ying's avatar Liu Ying Committed by Philipp Zabel
Browse files

drm/imx: dw_hdmi-imx: Fix bailout in error cases of probe 



In dw_hdmi_imx_probe(), if error happens after dw_hdmi_probe() returns
successfully, dw_hdmi_remove() should be called where necessary as
bailout.

Fixes: c805ec7e ("drm/imx: dw_hdmi-imx: move initialization into probe")
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Pengutronix Kernel Team <kernel@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Signed-off-by: default avatarLiu Ying <victor.liu@nxp.com>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Link: https://lore.kernel.org/r/20220128091944.3831256-1-victor.liu@nxp.com
parent bce81feb

drivers/gpu/drm/imx/dw_hdmi-imx.c

+7 −1
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev) 
	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *match = of_match_node(dw_hdmi_imx_dt_ids, np);

	struct imx_hdmi *hdmi;

	int ret;



	hdmi = devm_kzalloc(&pdev->dev, sizeof(*hdmi), GFP_KERNEL);

	if (!hdmi)
@@ -243,10 +244,15 @@ static int dw_hdmi_imx_probe(struct platform_device *pdev) 
	hdmi->bridge = of_drm_find_bridge(np);

	if (!hdmi->bridge) {

		dev_err(hdmi->dev, "Unable to find bridge\n");

		dw_hdmi_remove(hdmi->hdmi);

		return -ENODEV;

	}



	return component_add(&pdev->dev, &dw_hdmi_imx_ops);

	ret = component_add(&pdev->dev, &dw_hdmi_imx_ops);

	if (ret)

		dw_hdmi_remove(hdmi->hdmi);



	return ret;

}



static int dw_hdmi_imx_remove(struct platform_device *pdev)