Skip to contentSkip to conversation

memory: of: Add of_node_put() when breaking out of for_each_child_of_node()

PATCH In review Liang He 2 participants 3 messages Jul 16, 2022 – Jul 19, 2022 Memory controller drivers

lore
Share & tools
lore

Liang He

author
#0 lore raw

PATCH 1/1 memory: of: Add of_node_put() when breaking out of for_each_child_of_node()

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")
---
 drivers/memory/of_memory.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/memory/of_memory.c +2 -0
index dbdf87bc0b78..cd57af9e5ff6 100644
@@ -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;
 			}
Signature · 1 line
2.25.1
#1 lore raw
Quoted 4 lines · Liang He

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.

Quoted 2 lines
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.

Quoted 4 lines
---
 drivers/memory/of_memory.c | 2 ++
 1 file changed, 2 insertions(+)

Best regards,
Krzysztof

author
#2 lore raw
Quoted 11 lines · Krzysztof Kozlowski
Quoted 4 lines · Liang He

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.

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

Please split the patches into two separate fixes.

Quoted 4 lines
---
 drivers/memory/of_memory.c | 2 ++
 1 file changed, 2 insertions(+)

Best regards,
Krzysztof

I will do that soon.

Thanks,
Liang