From mboxrd@z Thu Jan 1 00:00:00 1970 From: will.deacon@arm.com (Will Deacon) Date: Fri, 1 Jul 2016 11:33:47 +0100 Subject: [PATCH 4/7] bus: arm-cci: add missing of_node_put after calling of_parse_phandle In-Reply-To: <57764626.4060800@arm.com> References: <1467366121-14120-1-git-send-email-peter.chen@nxp.com> <1467366121-14120-5-git-send-email-peter.chen@nxp.com> <57764626.4060800@arm.com> Message-ID: <20160701103346.GF12735@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Jul 01, 2016 at 11:29:58AM +0100, Suzuki K Poulose wrote: > On 01/07/16 10:41, Peter Chen wrote: > >of_node_put needs to be called when the device node which is got > >from of_parse_phandle has finished using. > > > >Cc: Will Deacon > >Cc: Suzuki K Poulose > >Signed-off-by: Peter Chen > > Thanks for the fix. > > >--- > > 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 Please route this via arm-soc once you've addressed Suzuki's comment. Will