From 002be81140075e17a1ebd5c3c55e356fbab0ddad Mon Sep 17 00:00:00 2001

From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Date: Fri, 28 May 2021 07:51:26 -0400

Subject: [PATCH] mfd: core: Add missing of_node_put for loop iteration

Git-commit: 002be81140075e17a1ebd5c3c55e356fbab0ddad

Patch-mainline: v5.16-rc1

References: git-fixes stable-5.14.19

Early exits from for_each_child_of_node() should decrement the

node reference counter.  Reported by Coccinelle:

  drivers/mfd/mfd-core.c:197:2-24: WARNING:

    Function "for_each_child_of_node" should have of_node_put() before goto around lines 209.

Fixes: c94bb233a9fe ("mfd: Make MFD core code Device Tree and IRQ domain aware")

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Signed-off-by: Lee Jones <lee.jones@linaro.org>

Link: https://lore.kernel.org/r/20210528115126.18370-1-krzysztof.kozlowski@canonical.com

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/mfd/mfd-core.c | 2 ++

 1 file changed, 2 insertions(+)

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c

index 79f5c6a18815..684a011a6396 100644

--- a/drivers/mfd/mfd-core.c

+++ b/drivers/mfd/mfd-core.c

@@ -198,6 +198,7 @@ static int mfd_add_device(struct device *parent, int id,

 			if (of_device_is_compatible(np, cell->of_compatible)) {

 				/* Ignore 'disabled' devices error free */

 				if (!of_device_is_available(np)) {

+					of_node_put(np);

 					ret = 0;

 					goto fail_alias;

 				}

@@ -205,6 +206,7 @@ static int mfd_add_device(struct device *parent, int id,

 				ret = mfd_match_of_node_to_dev(pdev, np, cell);

 				if (ret == -EAGAIN)

 					continue;

+				of_node_put(np);

 				if (ret)

 					goto fail_alias;

-- 

2.26.2