From: Arvind Yadav <arvind.yadav.cs@gmail.com>
To: mturquette@baylibre.com, sboyd@codeaurora.org
Cc: geert+renesas@glider.be, laurent.pinchart@ideasonboard.com,
horms+renesas@verge.net.au, ulf.hansson@linaro.org,
linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org,
Arvind Yadav <arvind.yadav.cs@gmail.com>
Subject: [PATCH] clk: renesas: clk-mstp: Free memory and Unmap region obtained by kzalloc and of_iomap
Date: Tue, 20 Sep 2016 18:09:19 +0530 [thread overview]
Message-ID: <1474375159-16568-1-git-send-email-arvind.yadav.cs@gmail.com> (raw)
From: Arvind Yadav <arvind.yadav.cs@gmail.com>
Free memory and memory mapping , if cpg_mstp_clocks_init is not successful.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
---
drivers/clk/renesas/clk-mstp.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/renesas/clk-mstp.c b/drivers/clk/renesas/clk-mstp.c
index 5093a25..19e73c8 100644
--- a/drivers/clk/renesas/clk-mstp.c
+++ b/drivers/clk/renesas/clk-mstp.c
@@ -179,14 +179,20 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
group->data.clks = clks;
group->smstpcr = of_iomap(np, 0);
- group->mstpsr = of_iomap(np, 1);
-
if (group->smstpcr == NULL) {
pr_err("%s: failed to remap SMSTPCR\n", __func__);
kfree(group);
kfree(clks);
return;
}
+ group->mstpsr = of_iomap(np, 1);
+ if (group->mstpsr == NULL) {
+ pr_err("%s: failed to remap MSTPCR\n", __func__);
+ iounmap(group->smstpcr);
+ kfree(group);
+ kfree(clks);
+ return;
+ }
for (i = 0; i < MSTP_MAX_CLOCKS; ++i)
clks[i] = ERR_PTR(-ENOENT);
@@ -236,6 +242,10 @@ static void __init cpg_mstp_clocks_init(struct device_node *np)
} else {
pr_err("%s: failed to register %s %s clock (%ld)\n",
__func__, np->name, name, PTR_ERR(clks[clkidx]));
+ iounmap(group->smstpcr);
+ iounmap(group->mstpsr);
+ kfree(group);
+ kfree(clks);
}
}
--
1.7.9.5
next reply other threads:[~2016-09-20 12:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 12:39 Arvind Yadav [this message]
2016-09-20 12:49 ` [PATCH] clk: renesas: clk-mstp: Free memory and Unmap region obtained by kzalloc and of_iomap Laurent Pinchart
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=1474375159-16568-1-git-send-email-arvind.yadav.cs@gmail.com \
--to=arvind.yadav.cs@gmail.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.org \
--cc=ulf.hansson@linaro.org \
/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