[PATCH] memory: of: Add of_node_put() when breaking out of for_each_child_of_node()

Liang He posted 1 patch 3 years, 9 months ago
drivers/memory/of_memory.c | 2 ++
1 file changed, 2 insertions(+)
[PATCH] memory: of: Add of_node_put() when breaking out of for_each_child_of_node()
Posted by Liang He 3 years, 9 months ago
In of_get_ddr_timings() and of_lpddr3_get_ddr_timings(), we should
add the of_node_put() when breaking out of for_each_child_of_node()
as it will automatically increase and decrease the refcount.

Fixes: 976897dd96db ("memory: Extend of_memory with LPDDR3 support")
Fixes: e6b42eb6a66c ("memory: emif: add device tree support to emif driver")
Signed-off-by: Liang He <windhl@126.com>
---
 drivers/memory/of_memory.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c
index dbdf87bc0b78..cd57af9e5ff6 100644
--- a/drivers/memory/of_memory.c
+++ b/drivers/memory/of_memory.c
@@ -134,6 +134,7 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr,
 	for_each_child_of_node(np_ddr, np_tim) {
 		if (of_device_is_compatible(np_tim, tim_compat)) {
 			if (of_do_get_timings(np_tim, &timings[i])) {
+				of_node_put(np_tim);
 				devm_kfree(dev, timings);
 				goto default_timings;
 			}
@@ -283,6 +284,7 @@ const struct lpddr3_timings
 	for_each_child_of_node(np_ddr, np_tim) {
 		if (of_device_is_compatible(np_tim, tim_compat)) {
 			if (of_lpddr3_do_get_timings(np_tim, &timings[i])) {
+				of_node_put(np_tim);
 				devm_kfree(dev, timings);
 				goto default_timings;
 			}
-- 
2.25.1
Re: [PATCH] memory: of: Add of_node_put() when breaking out of for_each_child_of_node()
Posted by Krzysztof Kozlowski 3 years, 9 months ago
On 16/07/2022 04:50, Liang He wrote:
> In of_get_ddr_timings() and of_lpddr3_get_ddr_timings(), we should
> add the of_node_put() when breaking out of for_each_child_of_node()
> as it will automatically increase and decrease the refcount.
> 

Thank you for your patch. There is something to discuss/improve.

> Fixes: 976897dd96db ("memory: Extend of_memory with LPDDR3 support")
> Fixes: e6b42eb6a66c ("memory: emif: add device tree support to emif driver")

Please split the patches into two separate fixes.

> Signed-off-by: Liang He <windhl@126.com>
> ---
>  drivers/memory/of_memory.c | 2 ++
>  1 file changed, 2 insertions(+)
Best regards,
Krzysztof
Re:Re: [PATCH] memory: of: Add of_node_put() when breaking out of for_each_child_of_node()
Posted by Liang He 3 years, 9 months ago
At 2022-07-19 16:18:31, "Krzysztof Kozlowski" <krzysztof.kozlowski@linaro.org> wrote:
>On 16/07/2022 04:50, Liang He wrote:
>> In of_get_ddr_timings() and of_lpddr3_get_ddr_timings(), we should
>> add the of_node_put() when breaking out of for_each_child_of_node()
>> as it will automatically increase and decrease the refcount.
>> 
>
>Thank you for your patch. There is something to discuss/improve.
>
>> Fixes: 976897dd96db ("memory: Extend of_memory with LPDDR3 support")
>> Fixes: e6b42eb6a66c ("memory: emif: add device tree support to emif driver")
>
>Please split the patches into two separate fixes.
>
>> Signed-off-by: Liang He <windhl@126.com>
>> ---
>>  drivers/memory/of_memory.c | 2 ++
>>  1 file changed, 2 insertions(+)
>Best regards,
>Krzysztof

I will do that soon.

Thanks, 
Liang