Merge tag 'drm-next-2018-10-24' of git://anongit.freedesktop.org/drm/drm

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / mediatek / mtk_hdmi.c

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 11e3644..862f3ec 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1452,8 +1452,7 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
        }
 
        /* The CEC module handles HDMI hotplug detection */
-       cec_np = of_find_compatible_node(np->parent, NULL,
-                                        "mediatek,mt8173-cec");
+       cec_np = of_get_compatible_child(np->parent, "mediatek,mt8173-cec");
        if (!cec_np) {
                dev_err(dev, "Failed to find CEC node\n");
                return -EINVAL;
@@ -1463,8 +1462,10 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,
        if (!cec_pdev) {
                dev_err(hdmi->dev, "Waiting for CEC device %pOF\n",
                        cec_np);
+               of_node_put(cec_np);
                return -EPROBE_DEFER;
        }
+       of_node_put(cec_np);
        hdmi->cec_dev = &cec_pdev->dev;
 
        /*