Unverified Commit 11055c32 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Renesas ARM SoC updates for v5.20

  - Fix of_node reference counting in the R-Car Gen2 board quirk.

* tag 'renesas-arm-soc-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: shmobile: rcar-gen2: Increase refcount for new reference

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a2668c15 75a185fb

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

+4 −1
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ static int regulator_quirk_notify(struct notifier_block *nb, 


	list_for_each_entry_safe(pos, tmp, &quirk_list, list) {

		list_del(&pos->list);

		of_node_put(pos->np);

		kfree(pos);

	}
@@ -174,11 +175,12 @@ static int __init rcar_gen2_regulator_quirk(void) 
		memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg));



		quirk->id = id;

		quirk->np = np;

		quirk->np = of_node_get(np);

		quirk->i2c_msg.addr = addr;



		ret = of_irq_parse_one(np, 0, argsa);

		if (ret) {	/* Skip invalid entry and continue */

			of_node_put(np);

			kfree(quirk);

			continue;

		}
@@ -225,6 +227,7 @@ static int __init rcar_gen2_regulator_quirk(void) 
err_mem:

	list_for_each_entry_safe(pos, tmp, &quirk_list, list) {

		list_del(&pos->list);

		of_node_put(pos->np);

		kfree(pos);

	}