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

arndb · arndb · commit f99d621133ef · 2022-07-01T22:27:45.000+02:00
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: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-meson/platsmp.c b/arch/arm/mach-meson/platsmp.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`sram_base = of_iomap(node, 0);`
	`74`	`+ of_node_put(node);`
`74`	`75`	`if (!sram_base) {`
`75`	`76`	`pr_err("Couldn't map SRAM registers\n");`
`76`	`77`	`return;`
`@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`scu_base = of_iomap(node, 0);`
	`95`	`+ of_node_put(node);`
`94`	`96`	`if (!scu_base) {`
`95`	`97`	`pr_err("Couldn't map SCU registers\n");`
`96`	`98`	`return;`