Commit c9d5cbe8 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kleber Sacilotto de Souza

ARM: hisi: check of_iomap and fix missing of_node_put

BugLink: https://bugs.launchpad.net/bugs/1798587

[ Upstream commit 81646a3d ]

of_find_compatible_node() returns a device node with refcount incremented
and thus needs an explicit of_node_put(). Further relying on an unchecked
of_iomap() which can return NULL is problematic here, after all ctrl_base
is critical enough for hix5hd2_set_cpu() to call BUG() if not available
so a check seems mandated here.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
0002 Fixes: commit 06cc5c1d ("ARM: hisi: enable hix5hd2 SoC")
Signed-off-by: default avatarWei Xu <xuwei5@hisilicon.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 1ad7e25e
...@@ -180,11 +180,15 @@ static bool hix5hd2_hotplug_init(void) ...@@ -180,11 +180,15 @@ static bool hix5hd2_hotplug_init(void)
struct device_node *np; struct device_node *np;
np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl"); np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
if (np) { if (!np)
return false;
ctrl_base = of_iomap(np, 0); ctrl_base = of_iomap(np, 0);
return true; of_node_put(np);
} if (!ctrl_base)
return false; return false;
return true;
} }
void hix5hd2_set_cpu(int cpu, bool enable) void hix5hd2_set_cpu(int cpu, bool enable)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment