diff options
| author | Matthias Brugger <matthias.bgg@gmail.com> | 2019-06-21 08:32:50 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 15:11:40 +0200 |
| commit | 3c9b7867785670ebcd28f01d3028339063582559 (patch) | |
| tree | 1731259d1997505eb760a5fbda6ef5ebb0ac034c /drivers | |
| parent | 392574fcd9315477d3c455e35c3deba6d3ce7b4a (diff) | |
| download | linux-stable-3c9b7867785670ebcd28f01d3028339063582559.tar.gz linux-stable-3c9b7867785670ebcd28f01d3028339063582559.tar.bz2 linux-stable-3c9b7867785670ebcd28f01d3028339063582559.zip | |
media: mtk-mdp: fix reference count on old device tree
[ 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c index fc9faec85edb..5d44f2e92dd5 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c @@ -110,7 +110,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 { |