From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138AbbGaJk3 (ORCPT ); Fri, 31 Jul 2015 05:40:29 -0400 Received: from down.free-electrons.com ([37.187.137.238]:33788 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751114AbbGaJkV (ORCPT ); Fri, 31 Jul 2015 05:40:21 -0400 From: Alexandre Belloni To: Nicolas Ferre Cc: Boris Brezillon , Maxime Ripard , Jean-Christophe Plagniol-Villard , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alexandre Belloni , Daniel Lezcano , Thomas Gleixner Subject: [PATCH 21/23] clocksource: tcb_clksrc: fix setup_clkevents error path Date: Fri, 31 Jul 2015 11:39:57 +0200 Message-Id: <1438335599-3301-22-git-send-email-alexandre.belloni@free-electrons.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1438335599-3301-1-git-send-email-alexandre.belloni@free-electrons.com> References: <1438335599-3301-1-git-send-email-alexandre.belloni@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Boris Brezillon t2_clk is already disabled before request_irq(), it must not be disabled again. Signed-off-by: Boris Brezillon Signed-off-by: Alexandre Belloni --- Cc: Daniel Lezcano Cc: Thomas Gleixner 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