OSDN Git Service

memory: ti-aemif: Drop child node when jumping out loop
authorPan Bian <bianpan2016@163.com>
Thu, 21 Jan 2021 09:03:59 +0000 (01:03 -0800)
committerKrzysztof Kozlowski <krzk@kernel.org>
Mon, 25 Jan 2021 19:18:42 +0000 (20:18 +0100)
Call of_node_put() to decrement the reference count of the child node
child_np when jumping out of the loop body of
for_each_available_child_of_node(), which is a macro that increments and
decrements the reference count of child node. If the loop is broken, the
reference of the child node should be dropped manually.

Fixes: 5a7c81547c1d ("memory: ti-aemif: introduce AEMIF driver")
Signed-off-by: Pan Bian <bianpan2016@163.com>
Link: https://lore.kernel.org/r/20210121090359.61763-1-bianpan2016@163.com
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
drivers/memory/ti-aemif.c

index 159a16f..51d20c2 100644 (file)
@@ -378,8 +378,10 @@ static int aemif_probe(struct platform_device *pdev)
                 */
                for_each_available_child_of_node(np, child_np) {
                        ret = of_aemif_parse_abus_config(pdev, child_np);
-                       if (ret < 0)
+                       if (ret < 0) {
+                               of_node_put(child_np);
                                goto error;
+                       }
                }
        } else if (pdata && pdata->num_abus_data > 0) {
                for (i = 0; i < pdata->num_abus_data; i++, aemif->num_cs++) {
@@ -405,8 +407,10 @@ static int aemif_probe(struct platform_device *pdev)
                for_each_available_child_of_node(np, child_np) {
                        ret = of_platform_populate(child_np, NULL,
                                                   dev_lookup, dev);
-                       if (ret < 0)
+                       if (ret < 0) {
+                               of_node_put(child_np);
                                goto error;
+                       }
                }
        } else if (pdata) {
                for (i = 0; i < pdata->num_sub_devices; i++) {