From: Shawn Lin <shawn.lin@rock-chips.com>
To: Heiko Stuebner <heiko@sntech.de>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org,
linux-kernel@vger.kernel.org,
Shawn Lin <shawn.lin@rock-chips.com>
Subject: [PATCH 1/6] clk: rockchip: handle alt_parent in err cases when registering cpuclk
Date: Mon, 15 Feb 2016 11:33:15 +0800 [thread overview]
Message-ID: <1455507195-12955-1-git-send-email-shawn.lin@rock-chips.com> (raw)
In-Reply-To: <1455507153-12914-1-git-send-email-shawn.lin@rock-chips.com>
Add clk_disable_unprepare to handle cpuclk->alt_parent if
rockchip_clk_register_cpuclk fails.
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---
drivers/clk/rockchip/clk-cpu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/rockchip/clk-cpu.c b/drivers/clk/rockchip/clk-cpu.c
index d07374f..68a2a87 100644
--- a/drivers/clk/rockchip/clk-cpu.c
+++ b/drivers/clk/rockchip/clk-cpu.c
@@ -290,14 +290,14 @@ struct clk *rockchip_clk_register_cpuclk(const char *name,
pr_err("%s: could not lookup parent clock %s\n",
__func__, parent_names[0]);
ret = -EINVAL;
- goto free_cpuclk;
+ goto free_alt_parent;
}
ret = clk_notifier_register(clk, &cpuclk->clk_nb);
if (ret) {
pr_err("%s: failed to register clock notifier for %s\n",
__func__, name);
- goto free_cpuclk;
+ goto free_alt_parent;
}
if (nrates > 0) {
@@ -326,6 +326,8 @@ free_rate_table:
kfree(cpuclk->rate_table);
unregister_notifier:
clk_notifier_unregister(clk, &cpuclk->clk_nb);
+free_alt_parent:
+ clk_disable_unprepare(cpuclk->alt_parent);
free_cpuclk:
kfree(cpuclk);
return ERR_PTR(ret);
--
2.3.7
next prev parent reply other threads:[~2016-02-15 3:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 3:32 [PATCH 0/6] Some trivial fixes for rockchip clk/pm stuff Shawn Lin
2016-02-15 3:33 ` Shawn Lin [this message]
2016-02-15 21:39 ` [PATCH 1/6] clk: rockchip: handle alt_parent in err cases when registering cpuclk Heiko Stuebner
2016-02-15 3:33 ` [PATCH 2/6] clk: rockchip: check grf when waiting pll lock Shawn Lin
2016-02-15 21:40 ` Heiko Stuebner
2016-02-15 3:33 ` [PATCH 3/6] clk: rockchip: don't return NULL when registering inverter fails Shawn Lin
2016-02-15 22:41 ` Heiko Stuebner
2016-02-15 3:33 ` [PATCH 4/6] clk: rockchip: don't return NULL when registering mmc branch fails Shawn Lin
2016-02-15 22:42 ` Heiko Stuebner
2016-02-15 3:33 ` [PATCH 5/6] clk: rockchip: fix coding style for clk-cpu.c Shawn Lin
2016-02-15 22:42 ` Heiko Stuebner
2016-02-15 3:33 ` [PATCH 6/6] soc: rockchip: power-domain: check the existing of regmap Shawn Lin
2016-02-15 21:26 ` Heiko Stuebner
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=1455507195-12955-1-git-send-email-shawn.lin@rock-chips.com \
--to=shawn.lin@rock-chips.com \
--cc=heiko@sntech.de \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@codeaurora.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
all inboxes | Powered by JetHome®