From: Arvind Yadav <arvind.yadav.cs@gmail.com>
To: baohua@kernel.org, daniel.lezcano@linaro.org, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH V3] clocksource/timer-imx-gpt: Preventing resource leakage in error case.
Date: Fri, 23 Sep 2016 17:27:54 +0530 [thread overview]
Message-ID: <1474631874-5777-1-git-send-email-arvind.yadav.cs@gmail.com> (raw)
-Free previously allocated memory.
-Unmap I/O memory from kernel address space.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/clocksource/timer-imx-gpt.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index f595460..31cfccf 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -489,12 +489,16 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
return -ENOMEM;
imxtm->base = of_iomap(np, 0);
- if (!imxtm->base)
- return -ENXIO;
+ if (!imxtm->base) {
+ ret = -ENXIO;
+ goto error_free;
+ }
imxtm->irq = irq_of_parse_and_map(np, 0);
- if (imxtm->irq <= 0)
- return -EINVAL;
+ if (imxtm->irq <= 0) {
+ ret = -EINVAL;
+ goto error_iounmap;
+ }
imxtm->clk_ipg = of_clk_get_by_name(np, "ipg");
@@ -506,12 +510,19 @@ static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type t
imxtm->type = type;
ret = _mxc_timer_init(imxtm);
- if (ret)
- return ret;
+ if (ret) {
+ goto error_iounmap;
+ }
initialized = 1;
return 0;
+
+error_iounmap:
+ iounmap(imxtm->base);
+error_kfree:
+ kfree(imxtm);
+ return ret;
}
static int __init imx1_timer_init_dt(struct device_node *np)
--
2.7.4
next reply other threads:[~2016-09-23 11:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-23 11:57 Arvind Yadav [this message]
2016-09-23 16:41 ` [PATCH V3] clocksource/timer-imx-gpt: Preventing resource leakage in error case Thomas Gleixner
2016-09-24 7:40 ` arvind Yadav
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=1474631874-5777-1-git-send-email-arvind.yadav.cs@gmail.com \
--to=arvind.yadav.cs@gmail.com \
--cc=baohua@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).