Commit 24dbc773 authored Jul 12, 2018 by Nicholas Mc Guire Committed by Greg Kroah-Hartman Sep 26, 2018

ARM: hisi: handle of_iomap and fix missing of_node_put



[ Upstream commit d396cb185c0337aae5664b250cdd9a73f6eb1503 ]

Relying on an unchecked of_iomap() which can return NULL is problematic
here, an explicit check seems mandatory. Also the call to
of_find_compatible_node() returns a device node with refcount incremented
therefor an explicit of_node_put() is needed here.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Fixes: commit 22bae429 ("ARM: hi3xxx: add hotplug support")
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7fd68381

arch/arm/mach-hisi/hotplug.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -148,14 +148,21 @@ static int hi3xxx_hotplug_init(void)
		struct device_node *node;

		node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
		if (node) {
		if (!node) {
		id = ERROR_CTRL;
		return -ENOENT;
		}

		ctrl_base = of_iomap(node, 0);
		of_node_put(node);
		if (!ctrl_base) {
		id = ERROR_CTRL;
		return -ENOMEM;
		}

		id = HI3620_CTRL;
		return 0;
		}
		id = ERROR_CTRL;
		return -ENOENT;
		}

		void hi3xxx_set_cpu(int cpu, bool enable)
		{