summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-hisi
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2018-07-12 11:28:23 +0200
committerWei Xu <xuwei5@hisilicon.com>2018-07-16 18:36:47 +0200
commit81646a3d39ef14749301374a3a0b8311384cd412 (patch)
tree1ad38911815a8ab4d177dc9cef906bc0f950d227 /arch/arm/mach-hisi
parentARM: hisi: fix error handling and missing of_node_put (diff)
downloadlinux-81646a3d39ef14749301374a3a0b8311384cd412.tar.xz
linux-81646a3d39ef14749301374a3a0b8311384cd412.zip
ARM: hisi: check of_iomap and fix missing of_node_put
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: Nicholas Mc Guire <hofrat@osadl.org> 0002 Fixes: commit 06cc5c1d4d73 ("ARM: hisi: enable hix5hd2 SoC") Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Diffstat (limited to 'arch/arm/mach-hisi')
-rw-r--r--arch/arm/mach-hisi/hotplug.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-hisi/hotplug.c b/arch/arm/mach-hisi/hotplug.c
index 3b0d1c695108..ae5461cfb67f 100644
--- a/arch/arm/mach-hisi/hotplug.c
+++ b/arch/arm/mach-hisi/hotplug.c
@@ -173,11 +173,15 @@ static bool hix5hd2_hotplug_init(void)
struct device_node *np;
np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
- if (np) {
- ctrl_base = of_iomap(np, 0);
- return true;
- }
- return false;
+ if (!np)
+ return false;
+
+ ctrl_base = of_iomap(np, 0);
+ of_node_put(np);
+ if (!ctrl_base)
+ return false;
+
+ return true;
}
void hix5hd2_set_cpu(int cpu, bool enable)