Unverified Commit f99d6211 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm-for-v5.20' of... 

Merge tag 'amlogic-arm-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes

Amlogic ARM mach-meson changes for v5.20:
- Fix refcount leak in meson_smp_prepare_cpus

* tag 'amlogic-arm-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  ARM: meson: Fix refcount leak in meson_smp_prepare_cpus

Link: https://lore.kernel.org/r/cbf6bcb5-c7be-40fe-4436-4578c9d6c532@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d95ce66d 34d2cd3f

arch/arm/mach-meson/platsmp.c

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, 
	}



	sram_base = of_iomap(node, 0);

	of_node_put(node);

	if (!sram_base) {

		pr_err("Couldn't map SRAM registers\n");

		return;
@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible, 
	}



	scu_base = of_iomap(node, 0);

	of_node_put(node);

	if (!scu_base) {

		pr_err("Couldn't map SCU registers\n");

		return;