Thread (18 messages) flat view 18 messages, 7 authors, 2016-07-11

[PATCH 4/7] bus: arm-cci: add missing of_node_put after calling of_parse_phandle

From: Will Deacon <hidden>
Date: 2016-07-01 10:34:01
Also in: linux-pm, linux-renesas-soc, linux-samsung-soc, lkml

On Fri, Jul 01, 2016 at 11:29:58AM +0100, Suzuki K Poulose wrote:
On 01/07/16 10:41, Peter Chen wrote:
quoted
of_node_put needs to be called when the device node which is got
from of_parse_phandle has finished using.

Cc: Will Deacon <redacted>
Cc: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Peter Chen <redacted>
Thanks for the fix.
quoted
---
 drivers/bus/arm-cci.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index a49b283..e7b0b8c 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -1912,9 +1912,12 @@ static int __cci_ace_get_port(struct device_node *dn, int type)
 	cci_portn = of_parse_phandle(dn, "cci-control-port", 0);
 	for (i = 0; i < nb_cci_ports; i++) {
 		ace_match = ports[i].type == type;
-		if (ace_match && cci_portn == ports[i].dn)
+		if (ace_match && cci_portn == ports[i].dn) {
+			of_node_put(cci_portn);
 			return i;
+		}
 	}
+	of_node_put(cci_portn);
nit: Could we please do some thing like this ?
		if (ace_match && cci_portn == ports[i].dn)
			break;
	}

	of_node_put(cci_portn);
	return (i < nb_cci_ports) ? i : -ENODEV ;

Either way,

Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Please route this via arm-soc once you've addressed Suzuki's comment.

Will
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help