From: chenlifu <chenlifu@huawei.com>
To: <lkundrak@v3.sk>, <linux@armlinux.org.uk>, <olof@lixom.net>,
<pavel@ucw.cz>, <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in mmp_dt_init_timer()
Date: Sat, 8 Oct 2022 16:43:40 +0800 [thread overview]
Message-ID: <e4008fd2-86b3-c515-e9ec-40c11b28545c@huawei.com> (raw)
In-Reply-To: <20220907061454.3800923-1-chenlifu@huawei.com>
在 2022/9/7 14:14, Chen Lifu 写道:
> mmp_dt_init_timer() may have called clk_prepare_enable() before return
> from failed branches, add missing clk_disable_unprepare() in these cases.
>
> Fixes: f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")
> Signed-off-by: Chen Lifu <chenlifu@huawei.com>
> ---
> arch/arm/mach-mmp/time.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
> index 41b2e8abc9e6..6d2db1fea1be 100644
> --- a/arch/arm/mach-mmp/time.c
> +++ b/arch/arm/mach-mmp/time.c
> @@ -207,16 +207,20 @@ static int __init mmp_dt_init_timer(struct device_node *np)
> } else {
> rate = 3250000;
> }
>
> irq = irq_of_parse_and_map(np, 0);
> - if (!irq)
> + if (!irq) {
> + clk_disable_unprepare(clk);
> return -EINVAL;
> + }
>
> mmp_timer_base = of_iomap(np, 0);
> - if (!mmp_timer_base)
> + if (!mmp_timer_base) {
> + clk_disable_unprepare(clk);
> return -ENOMEM;
> + }
>
> mmp_timer_init(irq, rate);
> return 0;
> }
>
friendly ping ...
prev parent reply other threads:[~2022-10-08 8:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 6:14 [PATCH -next] ARM: mmp: Add missing clk_disable_unprepare() in mmp_dt_init_timer() Chen Lifu
2022-10-08 8:43 ` chenlifu [this message]
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=e4008fd2-86b3-c515-e9ec-40c11b28545c@huawei.com \
--to=chenlifu@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lkundrak@v3.sk \
--cc=olof@lixom.net \
--cc=pavel@ucw.cz \
/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).