Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1912dc2 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Greg Kroah-Hartman
Browse files

ARM: hisi: fix error handling and missing of_node_put 



[ Upstream commit 9f30b5ae0585ca5234fe979294b8f897299dec99 ]

of_iomap() can return NULL which seems critical here and thus should be
explicitly flagged so that the cause of system halting can be understood.
As of_find_compatible_node() is returning a device node with refcount
incremented it must be explicitly decremented here.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Fixes: commit 7fda91e7 ("ARM: hisi: enable smp for HiP01")
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>
parent 24dbc773

arch/arm/mach-hisi/hotplug.c

+4 −4
Original line number Diff line number Diff line
@@ -226,10 +226,10 @@ void hip01_set_cpu(int cpu, bool enable) 


	if (!ctrl_base) {

		np = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");

		if (np)

		BUG_ON(!np);

		ctrl_base = of_iomap(np, 0);

		else

			BUG();

		of_node_put(np);

		BUG_ON(!ctrl_base);

	}



	if (enable) {