Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1208218

[PATCH v4 3/4] clocksource: tcb_clksrc: fix setup_clkevents error path

From Alexandre Belloni <alexandre.belloni@free-electrons.com>
Newsgroups linux.kernel
Subject [PATCH v4 3/4] clocksource: tcb_clksrc: fix setup_clkevents error path
Date 2015-08-16 11:30 +0200
Message-ID <pY2qm-4ld-7@gated-at.bofh.it> (permalink)
References <pY2qm-4ld-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v4 0/4] ARM: at91: Properly handle slow clock Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-16 11:30 +0200
  [PATCH v4 3/4] clocksource: tcb_clksrc: fix setup_clkevents error path Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-16 11:30 +0200
  [PATCH v4 1/4] watchdog: at91sam9: get and use slow clock Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-16 11:30 +0200
  [PATCH v4 4/4] misc: atmel_tclib: get and use slow clock Alexandre Belloni <alexandre.belloni@free-electrons.com> - 2015-08-16 11:30 +0200

csiph-web