summaryrefslogtreecommitdiffstats
path: root/drivers/soc/bcm
diff options
context:
space:
mode:
authorYangtao Li <tiny.windzz@gmail.com>2018-11-24 15:52:23 +0100
committerFlorian Fainelli <f.fainelli@gmail.com>2018-11-28 22:46:44 +0100
commit1861a7f07e02292830a1ca256328d370deefea30 (patch)
treef6137e63cedc83b05908ababb084ef423663cf07 /drivers/soc/bcm
parentMerge tag 'tags/bcm2835-drivers-next-2018-11-27' into drivers/next (diff)
downloadlinux-1861a7f07e02292830a1ca256328d370deefea30.tar.xz
linux-1861a7f07e02292830a1ca256328d370deefea30.zip
soc: bcm: brcmstb: Don't leak device tree node reference
of_find_node_by_path() acquires a reference to the node returned by it and that reference needs to be dropped by its caller. soc_is_brcmstb() doesn't do that, so fix it. [treding: slightly rewrite to avoid inline comparison] Fixes: d52fad262041 ("soc: add stubs for brcmstb SoC's") Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers/soc/bcm')
-rw-r--r--drivers/soc/bcm/brcmstb/common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/soc/bcm/brcmstb/common.c b/drivers/soc/bcm/brcmstb/common.c
index 14185451901d..bf9123f727e8 100644
--- a/drivers/soc/bcm/brcmstb/common.c
+++ b/drivers/soc/bcm/brcmstb/common.c
@@ -31,13 +31,17 @@ static const struct of_device_id brcmstb_machine_match[] = {
bool soc_is_brcmstb(void)
{
+ const struct of_device_id *match;
struct device_node *root;
root = of_find_node_by_path("/");
if (!root)
return false;
- return of_match_node(brcmstb_machine_match, root) != NULL;
+ match = of_match_node(brcmstb_machine_match, root);
+ of_node_put(root);
+
+ return match != NULL;
}
u32 brcmstb_get_family_id(void)