summaryrefslogtreecommitdiff
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorBoris Brezillon <boris.brezillon@free-electrons.com>2015-08-16 12:23:45 +0300
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-10-06 13:25:39 +0300
commiteed9fb9df47898ea62d71be7dcc3b36d95819a7c (patch)
tree238f69cae81ac1e3526ac0b244c75750139cd7a4 /drivers/clocksource
parent216ab8f155fba659e06df240862cf59acb8b7be5 (diff)
downloadlinux-eed9fb9df47898ea62d71be7dcc3b36d95819a7c.tar.xz
clocksource: tcb_clksrc: fix setup_clkevents error path
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>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/tcb_clksrc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index d28d2fe798d5..f8d11fcf80f1 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -208,7 +208,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;
}