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

Commit 5ad45307 authored by Matthias Brugger's avatar Matthias Brugger Committed by CK Hu
Browse files

drm/mediatek: fix null pointer dereference 



The probe function requests the interrupt before initializing
the ddp component. Which leads to a null pointer dereference at boot.
Fix this by requesting the interrput after all components got
initialized properly.

Fixes: 119f5173 ("drm/mediatek: Add DRM Driver for Mediatek SoC
MT8173.")
Signed-off-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>

Change-Id: I57193a7ab554dfb37c35a455900689333adf511c
parent f6c87239

drivers/gpu/drm/mediatek/mtk_disp_ovl.c

+7 −7
Original line number Diff line number Diff line
@@ -251,13 +251,6 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 
	if (irq < 0)

		return irq;



	ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,

			       IRQF_TRIGGER_NONE, dev_name(dev), priv);

	if (ret < 0) {

		dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);

		return ret;

	}



	comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DISP_OVL);

	if (comp_id < 0) {

		dev_err(dev, "Failed to identify by alias: %d\n", comp_id);
@@ -273,6 +266,13 @@ static int mtk_disp_ovl_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, priv);



	ret = devm_request_irq(dev, irq, mtk_disp_ovl_irq_handler,

			       IRQF_TRIGGER_NONE, dev_name(dev), priv);

	if (ret < 0) {

		dev_err(dev, "Failed to request irq %d: %d\n", irq, ret);

		return ret;

	}



	ret = component_add(dev, &mtk_disp_ovl_component_ops);

	if (ret)

		dev_err(dev, "Failed to add component: %d\n", ret);