Unverified Commit 6eecfd59 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v5.17-tag1' of... 

Merge tag 'renesas-arm-soc-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc

Renesas ARM SoC updates for v5.17

  - Add a missing of_node_put().

* tag 'renesas-arm-soc-for-v5.17-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: shmobile: rcar-gen2: Add missing of_node_put()

Link: https://lore.kernel.org/r/cover.1638530611.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 13605725 85744f2d

arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c

+4 −1
Original line number Diff line number Diff line
@@ -154,8 +154,10 @@ static int __init rcar_gen2_regulator_quirk(void) 
		return -ENODEV;



	for_each_matching_node_and_match(np, rcar_gen2_quirk_match, &id) {

		if (!of_device_is_available(np))

		if (!of_device_is_available(np)) {

			of_node_put(np);

			break;

		}



		ret = of_property_read_u32(np, "reg", &addr);

		if (ret)	/* Skip invalid entry and continue */
@@ -164,6 +166,7 @@ static int __init rcar_gen2_regulator_quirk(void) 
		quirk = kzalloc(sizeof(*quirk), GFP_KERNEL);

		if (!quirk) {

			ret = -ENOMEM;

			of_node_put(np);

			goto err_mem;

		}