soc: sifive: Add missing of_node_put() in sifive_l2_cache.c
Subsystems (2)
PATCH v3 1/1 soc: sifive: Add missing of_node_put() in sifive_l2_cache.c
In sifive_l2_init(), of_find_matching_node() will return a node pointer with refcount incremented. We should use of_node_put() in each fail path or when it is not used anymore.
Signed-off-by Liang He <[email protected]>
---
changelog:
v3: (1) fix error introduced by v2, missing 'int ret;' (2) fix error
reported by checkpatch.pl (3) change subject title based on Conor's advice and drop the 'Reported by KLP' as this commit has not been applied.
v2: fix error introduced by v1, missing ';'
v1: fix missing of_node_put bug
drivers/soc/sifive/sifive_l2_cache.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/soc/sifive/sifive_l2_cache.c +17 -7
@@ -197,22 +197,28 @@ static int __init sifive_l2_init(void)struct device_node *np;struct resource res;int i, rc, intr_num; +int ret; np =of_find_matching_node (NULL , sifive_l2_ids);if (!np)return -ENODEV ; -if (of_address_to_resource (np,0 , &res)) -return -ENODEV ; +if (of_address_to_resource (np,0 , &res)) { + ret = -ENODEV ; + goto out_put; + } l2_base =ioremap (res.start,resource_size (&res)); -if (!l2_base) -return -ENOMEM ; +if (!l2_base) { + ret = -ENOMEM ; + goto out_put; + } intr_num =of_property_count_u32_elems (np,"interrupts" );if (!intr_num) {pr_err ("L2CACHE: no interrupts property\n" ); -return -ENODEV ; + ret = -ENODEV ; + goto out_put; }for (i =0 ; i < intr_num; i++) {
@@ -220,7 +226,8 @@ static int __init sifive_l2_init(void) rc =request_irq (g_irq[i], l2_int_handler,0 ,"l2_ecc" ,NULL );if (rc) {pr_err ("L2CACHE: Could not request IRQ %d\n" , g_irq[i]); -return rc; + ret = rc; + goto out_put; } }
@@ -232,6 +239,9 @@ static int __init sifive_l2_init(void)#ifdef CONFIG_DEBUG_FS setup_sifive_debug ();#endif -return 0 ; + ret =0 ; +out_put: +of_node_put (np); +return ret; }device_initcall (sifive_l2_init);
Signature · 1 line
2.25.1