[PATCHv2 4/4] clocksource: tcb_clksrc: unprepare clock in case of failure
From: Boris BREZILLON <hidden>
Date: 2014-09-03 10:10:22
Also in:
linux-pwm, lkml
On Fri, 29 Aug 2014 18:16:43 +0200 Ga?l PORTAY [off-list ref] wrote:
The clock is not unprepared in case of the request IRQ fails. Also update to request_irq.
As you're doing 2 different things in this commit (first move to request_irq and then disable the TC clk if the request fails) I would have chosen another commit title, like "clocksource: tcb_clksrc: sanitize IRQ request" Otherwise, you have my Acked-by: Boris Brezillon <redacted>
quoted hunk ↗ jump to hunk
Signed-off-by: Ga?l PORTAY <redacted> --- 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);
-- Boris Brezillon, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com