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

Merge tag 'at91-soc-5.17' of... 

Merge tag 'at91-soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/drivers

AT91 SoC #1 for 5.17:

- one low priority fix about of_node_put() missing in PM code

* tag 'at91-soc-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: pm: Add of_node_put() before goto

Link: https://lore.kernel.org/r/20211217164134.28566-1-nicolas.ferre@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b118863d bb29e409

arch/arm/mach-at91/pm.c

+2 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ static __init int at91_dt_ramc(bool phy_mandatory) 
		if (!soc_pm.data.ramc[idx]) {

			pr_err("unable to map ramc[%d] cpu registers\n", idx);

			ret = -ENOMEM;

			of_node_put(np);

			goto unmap_ramc;

		}
@@ -670,6 +671,7 @@ static __init int at91_dt_ramc(bool phy_mandatory) 
		if (!soc_pm.data.ramc_phy) {

			pr_err("unable to map ramc phy cpu registers\n");

			ret = -ENOMEM;

			of_node_put(np);

			goto unmap_ramc;

		}

	}