From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH v4 3/4] clocksource: tcb_clksrc: fix setup_clkevents error path
Date: Sun, 16 Aug 2015 11:23:45 +0200 [thread overview]
Message-ID: <1439717026-30634-4-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1439717026-30634-1-git-send-email-alexandre.belloni@free-electrons.com>
From: Boris Brezillon <boris.brezillon@free-electrons.com>
t2_clk is already disabled before request_irq(), it must not be disabled
again.
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/tcb_clksrc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 8bdbc45c6dad..b9b7277173c2 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -199,7 +199,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);
if (ret) {
- clk_disable_unprepare(t2_clk);
+ clk_unprepare(t2_clk);
return ret;
}
--
2.1.4
next prev parent reply other threads:[~2015-08-16 9:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-16 9:23 [PATCH v4 0/4] ARM: at91: Properly handle slow clock Alexandre Belloni
2015-08-16 9:23 ` [PATCH v4 1/4] watchdog: at91sam9: get and use " Alexandre Belloni
2015-08-16 9:23 ` [PATCH v4 2/4] clocksource: atmel-st: " Alexandre Belloni
2015-08-16 9:23 ` Alexandre Belloni [this message]
2015-08-16 9:23 ` [PATCH v4 4/4] misc: atmel_tclib: " Alexandre Belloni
2015-08-19 21:24 ` Daniel Lezcano
2015-10-05 15:27 ` Thierry Reding
2015-10-05 16:58 ` Alexandre Belloni
2015-10-06 7:33 ` Thierry Reding
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=1439717026-30634-4-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.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
all inboxes | Powered by JetHome®