media: mtk-mdp: fix reference count on old device tree
authorMatthias Brugger <matthias.bgg@gmail.com>
Fri, 21 Jun 2019 11:32:50 +0000 (08:32 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2019 11:09:41 +0000 (13:09 +0200)
[ Upstream commit 864919ea0380e62adb2503b89825fe358acb8216 ]

of_get_next_child() increments the reference count of the returning
device_node. Decrement it in the check if we are using the old or the
new DTB.

Fixes: ba1f1f70c2c0 ("[media] media: mtk-mdp: Fix mdp device tree")
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Houlong Wei <houlong.wei@mediatek.com>
[hverkuil-cisco@xs4all.nl: use node instead of parent as temp variable]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/mtk-mdp/mtk_mdp_core.c

index bbb24fb..3deb054 100644 (file)
@@ -118,7 +118,9 @@ static int mtk_mdp_probe(struct platform_device *pdev)
        mutex_init(&mdp->vpulock);
 
        /* Old dts had the components as child nodes */
-       if (of_get_next_child(dev->of_node, NULL)) {
+       node = of_get_next_child(dev->of_node, NULL);
+       if (node) {
+               of_node_put(node);
                parent = dev->of_node;
                dev_warn(dev, "device tree is out of date\n");
        } else {