summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorYangtao Li <tiny.windzz@gmail.com>2018-11-21 15:49:12 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-20 12:08:57 +0300
commitd31660b9452e40c10fc5f22b67ef7b47126f8c9a (patch)
treef89cfef01827735290f2b7acf5962e96f696caee /drivers/soc
parenta49c4cee298105eeacdeba020757601dff6f6aab (diff)
downloadlinux-d31660b9452e40c10fc5f22b67ef7b47126f8c9a.tar.xz
soc/tegra: Don't leak device tree node reference
[ Upstream commit 9eb40fa2cd2d1f6829e7b49bb22692f754b9cfe0 ] 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_tegra() doesn't do that, so fix it. Signed-off-by: Yangtao Li <tiny.windzz@gmail.com> Acked-by: Jon Hunter <jonathanh@nvidia.com> [treding: slightly rewrite to avoid inline comparison] Signed-off-by: Thierry Reding <treding@nvidia.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/tegra/common.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/soc/tegra/common.c b/drivers/soc/tegra/common.c
index a71cb74f3674..04323ade15dd 100644
--- a/drivers/soc/tegra/common.c
+++ b/drivers/soc/tegra/common.c
@@ -20,11 +20,15 @@ static const struct of_device_id tegra_machine_match[] = {
bool soc_is_tegra(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(tegra_machine_match, root) != NULL;
+ match = of_match_node(tegra_machine_match, root);
+ of_node_put(root);
+
+ return match != NULL;
}