From: gael.portay@gmail.com (Gaël PORTAY)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv3 4/4] clocksource: tcb_clksrc: sanitize IRQ request
Date: Fri, 5 Sep 2014 16:14:40 +0200 [thread overview]
Message-ID: <1409926480-16367-5-git-send-email-gael.portay@gmail.com> (raw)
In-Reply-To: <1409926480-16367-1-git-send-email-gael.portay@gmail.com>
The clock is not unprepared in case of the request IRQ fails.
Also update to request_irq.
Signed-off-by: Ga?l PORTAY <gael.portay@gmail.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
drivers/clocksource/tcb_clksrc.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index f922e81..8bdbc45 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -178,12 +178,6 @@ static irqreturn_t ch2_irq(int irq, void *handle)
return IRQ_NONE;
}
-static struct irqaction tc_irqaction = {
- .name = "tc_clkevt",
- .flags = IRQF_TIMER,
- .handler = ch2_irq,
-};
-
static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
{
int ret;
@@ -198,15 +192,16 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
clkevt.regs = tc->regs;
clkevt.clk = t2_clk;
- tc_irqaction.dev_id = &clkevt;
timer_clock = clk32k_divisor_idx;
clkevt.clkevt.cpumask = cpumask_of(0);
- ret = setup_irq(irq, &tc_irqaction);
- if (ret)
+ ret = request_irq(irq, ch2_irq, IRQF_TIMER, "tc_clkevt", &clkevt);
+ if (ret) {
+ clk_disable_unprepare(t2_clk);
return ret;
+ }
clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
--
1.9.3
prev parent reply other threads:[~2014-09-05 14:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 14:14 [PATCHv3 0/4] ARM: at91/tclib: fix segmentation fault Gaël PORTAY
2014-09-05 14:14 ` [PATCHv3 1/4] ARM: at91/tclib: prefer using of devm_* functions Gaël PORTAY
2014-09-05 14:14 ` [PATCHv3 2/4] ARM: at91/tclib: move initialization from alloc to probe Gaël PORTAY
2014-09-05 14:14 ` [PATCHv3 3/4] ARM: at91/tclib: mask interruptions at shutdown and probe Gaël PORTAY
2014-09-05 14:22 ` Daniel Lezcano
2014-09-05 14:14 ` Gaël PORTAY [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=1409926480-16367-5-git-send-email-gael.portay@gmail.com \
--to=gael.portay@gmail.com \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).