]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
backlight: tps65217_bl: Fix Device Tree node lookup
authorJohan Hovold <johan@kernel.org>
Mon, 20 Nov 2017 10:45:46 +0000 (11:45 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 14 Jan 2019 09:28:55 +0000 (09:28 +0000)
BugLink: http://bugs.launchpad.net/bugs/1807469
commit 2b12dfa124dbadf391cb9a616aaa6b056823bf75 upstream.

Fix child-node lookup during probe, which ended up searching the whole
device tree depth-first starting at the parent rather than just matching
on its children.

This would only cause trouble if the child node is missing while there
is an unrelated node named "backlight" elsewhere in the tree.

Cc: stable <stable@vger.kernel.org> # 3.7
Fixes: eebfdc17cc6c ("backlight: Add TPS65217 WLED driver")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/video/backlight/tps65217_bl.c

index 380917c862769524c56687c0e5bf86c8fc339914..762e3feed097cbd581f721d389a13dd52aa57aca 100644 (file)
@@ -184,11 +184,11 @@ static struct tps65217_bl_pdata *
 tps65217_bl_parse_dt(struct platform_device *pdev)
 {
        struct tps65217 *tps = dev_get_drvdata(pdev->dev.parent);
-       struct device_node *node = of_node_get(tps->dev->of_node);
+       struct device_node *node;
        struct tps65217_bl_pdata *pdata, *err;
        u32 val;
 
-       node = of_find_node_by_name(node, "backlight");
+       node = of_get_child_by_name(tps->dev->of_node, "backlight");
        if (!node)
                return ERR_PTR(-ENODEV);