linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] i2c: core: Add missing of_node_put()
@ 2016-04-15 12:43 Jon Hunter
  2016-04-15 14:58 ` Vladimir Zapolskiy
  0 siblings, 1 reply; 3+ messages in thread
From: Jon Hunter @ 2016-04-15 12:43 UTC (permalink / raw)
  To: Wolfram Sang; +Cc: linux-i2c, linux-kernel, Jon Hunter

for_each_available_child_of_node performs an of_node_get on each
iteration, so of_node_put() must be called on each iteration once
we are finished with the node pointer.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 drivers/i2c/i2c-core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 4979728f7fb2..38f4dae681a9 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1428,9 +1428,9 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
 	dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
 
 	for_each_available_child_of_node(adap->dev.of_node, node) {
-		if (of_node_test_and_set_flag(node, OF_POPULATED))
-			continue;
-		of_i2c_register_device(adap, node);
+		if (!of_node_test_and_set_flag(node, OF_POPULATED))
+			of_i2c_register_device(adap, node);
+		of_node_put(node);
 	}
 }
 
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] i2c: core: Add missing of_node_put()
  2016-04-15 12:43 [PATCH] i2c: core: Add missing of_node_put() Jon Hunter
@ 2016-04-15 14:58 ` Vladimir Zapolskiy
  2016-04-15 15:34   ` Jon Hunter
  0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Zapolskiy @ 2016-04-15 14:58 UTC (permalink / raw)
  To: Jon Hunter, Wolfram Sang; +Cc: linux-i2c, linux-kernel

On 15.04.2016 15:43, Jon Hunter wrote:
> for_each_available_child_of_node performs an of_node_get on each
> iteration, so of_node_put() must be called on each iteration once
> we are finished with the node pointer.

This is wrong, embedded of_get_next_available_child() correctly decrements
ref counter of an examined node.

> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---
>  drivers/i2c/i2c-core.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index 4979728f7fb2..38f4dae681a9 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -1428,9 +1428,9 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
>  	dev_dbg(&adap->dev, "of_i2c: walking child nodes\n");
>  
>  	for_each_available_child_of_node(adap->dev.of_node, node) {
> -		if (of_node_test_and_set_flag(node, OF_POPULATED))
> -			continue;
> -		of_i2c_register_device(adap, node);
> +		if (!of_node_test_and_set_flag(node, OF_POPULATED))
> +			of_i2c_register_device(adap, node);
> +		of_node_put(node);
>  	}
>  }
>  
> 

--
With best wishes,
Vladimir

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] i2c: core: Add missing of_node_put()
  2016-04-15 14:58 ` Vladimir Zapolskiy
@ 2016-04-15 15:34   ` Jon Hunter
  0 siblings, 0 replies; 3+ messages in thread
From: Jon Hunter @ 2016-04-15 15:34 UTC (permalink / raw)
  To: Vladimir Zapolskiy, Wolfram Sang; +Cc: linux-i2c, linux-kernel


On 15/04/16 15:58, Vladimir Zapolskiy wrote:
> On 15.04.2016 15:43, Jon Hunter wrote:
>> for_each_available_child_of_node performs an of_node_get on each
>> iteration, so of_node_put() must be called on each iteration once
>> we are finished with the node pointer.
> 
> This is wrong, embedded of_get_next_available_child() correctly decrements
> ref counter of an examined node.

Oh yes, sorry, I see that now. Sorry for the noise and mis-interpretation here :-(

Jon

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-04-15 15:34 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-15 12:43 [PATCH] i2c: core: Add missing of_node_put() Jon Hunter
2016-04-15 14:58 ` Vladimir Zapolskiy
2016-04-15 15:34   ` Jon Hunter

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).