lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.3 070/203] media: mtk-mdp: fix reference count on old device tree
    Date
    From: Matthias Brugger <matthias.bgg@gmail.com>

    [ 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 | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
    index fc9faec85edb6..5d44f2e92dd50 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 {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-22 21:37    [W:4.478 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site