From: Liang He <windhl@126.com>
To: palmer@dabbelt.com, paul.walmsley@sifive.com, aou@eecs.berkeley.edu
Cc: windhl@126.com, linux-riscv@lists.infradead.org,
linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com>
Subject: [PATCH v2] soc: sifive: (sifive_l2_cache) Add missing of_node_put()
Date: Thu, 16 Jun 2022 12:49:15 +0800 [thread overview]
Message-ID: <20220616044915.3978097-1-windhl@126.com> (raw)
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.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Liang He <windhl@126.com>
---
changelog:
v2: (1) fix bug, introduced by v1 patch, reporeted by kernel-test-robot
v1: fix missing bug
ps: Because of many local commit, when using --base for format-patch,
there are too many prerequest-patch-id. I wonder if it will lead to other
problems. So now, I send this commit still without --base.
drivers/soc/sifive/sifive_l2_cache.c | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/drivers/soc/sifive/sifive_l2_cache.c b/drivers/soc/sifive/sifive_l2_cache.c
index 59640a1d0b28..e0e3d8b64c25 100644
--- a/drivers/soc/sifive/sifive_l2_cache.c
+++ b/drivers/soc/sifive/sifive_l2_cache.c
@@ -202,17 +202,22 @@ static int __init sifive_l2_init(void)
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 +225,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 +238,10 @@ 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);
--
2.25.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next reply other threads:[~2022-06-16 4:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-16 4:49 Liang He [this message]
2022-06-16 5:54 ` Re:[PATCH v2] soc: sifive: (sifive_l2_cache) Add missing of_node_put() Liang He
2022-06-16 6:26 ` [PATCH " Conor.Dooley
2022-06-16 6:52 ` Liang He
2022-06-16 6:28 ` Conor.Dooley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220616044915.3978097-1-windhl@126.com \
--to=windhl@126.com \
--cc=aou@eecs.berkeley.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=lkp@intel.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox