From: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Sun, 16 Aug 2015 09:23:45 +0000 (+0200)
Subject: clocksource: tcb_clksrc: fix setup_clkevents error path
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=eed9fb9df47898ea62d71be7dcc3b36d95819a7c;p=deliverable%2Flinux.git

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>
---

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;
 	}