summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYangtao Li <tiny.windzz@gmail.com>2018-11-24 09:52:23 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-12 19:44:53 +0100
commitfa24ad75cfafdc4bdf4f947d25b1af438e70f1c6 (patch)
treeae3770d1abcc1c3672da7f5d8ccc6aea1fa5b9bf /drivers
parenta1ef7d5da9b2c145f811a80bb8197df6037a7572 (diff)
soc: bcm: brcmstb: Don't leak device tree node reference
[ Upstream commit 1861a7f07e02292830a1ca256328d370deefea30 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-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 94e7335553f4..3f6063b639ac 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;
}
static const struct of_device_id sun_top_ctrl_match[] = {