diff options
| author | Arnd Bergmann <[email protected]> | 2024-09-05 14:11:08 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2024-09-05 14:11:14 +0000 |
| commit | 639d5f6dee6eef470bcef434a5c401571602d9c4 (patch) | |
| tree | 4952395700fc5213f41a84e2f1bf7cfe6025417a | |
| parent | b1cd063981de572f010092b7afde5ff4b3d923eb (diff) | |
| parent | 15a62b81175885b5adfcaf49870466e3603f06c7 (diff) | |
Merge tag 'integrator-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into soc/drivers
Integrator fixes for the v6.12 kernel cycle, some of_node_put():s
were missing in the SoC drivers.
* tag 'integrator-v6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
bus: integrator-lm: fix OF node leak in probe()
ARM: versatile: fix OF node leak in CPUs prepare
Link: https://lore.kernel.org/r/CACRpkdahXECZXWA5uv=SZtkzU0E++fQj7QWK8kYuH0-asLUPqg@mail.gmail.com
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | arch/arm/mach-versatile/platsmp-realview.c | 1 | ||||
| -rw-r--r-- | drivers/bus/arm-integrator-lm.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-versatile/platsmp-realview.c b/arch/arm/mach-versatile/platsmp-realview.c index 6965a1de727b..d38b2e174257 100644 --- a/arch/arm/mach-versatile/platsmp-realview.c +++ b/arch/arm/mach-versatile/platsmp-realview.c @@ -70,6 +70,7 @@ static void __init realview_smp_prepare_cpus(unsigned int max_cpus) return; } map = syscon_node_to_regmap(np); + of_node_put(np); if (IS_ERR(map)) { pr_err("PLATSMP: No syscon regmap\n"); return; diff --git a/drivers/bus/arm-integrator-lm.c b/drivers/bus/arm-integrator-lm.c index b715c8ab36e8..a65c79b08804 100644 --- a/drivers/bus/arm-integrator-lm.c +++ b/drivers/bus/arm-integrator-lm.c @@ -85,6 +85,7 @@ static int integrator_ap_lm_probe(struct platform_device *pdev) return -ENODEV; } map = syscon_node_to_regmap(syscon); + of_node_put(syscon); if (IS_ERR(map)) { dev_err(dev, "could not find Integrator/AP system controller\n"); |