mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 21/23] clocksource: tcb_clksrc: fix setup_clkevents error path
Date: Fri, 31 Jul 2015 11:39:57 +0200	[thread overview]
Message-ID: <1438335599-3301-22-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1438335599-3301-1-git-send-email-alexandre.belloni@free-electrons.com>

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>
---
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
 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


  parent reply	other threads:[~2015-07-31  9:40 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-31  9:39 [PATCH 00/23] ARM: at91: Properly handle slow clock Alexandre Belloni
2015-07-31  9:39 ` [PATCH 01/23] Documentation: dt: atmel-at91: add clocks to system timer, rstc and shdwc Alexandre Belloni
2015-08-05 18:11   ` Sebastian Reichel
2015-07-31  9:39 ` [PATCH 02/23] Documentation: dt: atmel-at91: add slow clock to tcb Alexandre Belloni
2015-07-31  9:39 ` [PATCH 03/23] Documentation: watchdog: at91sam9_wdt: add clocks property Alexandre Belloni
2015-07-31  9:39 ` [PATCH 04/23] Documentation: dt: rtc: at91rm9200: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 05/23] ARM: at91/dt: at91rm9200: use slow clock where necessary Alexandre Belloni
2015-07-31  9:39 ` [PATCH 06/23] ARM: at91/dt: at91sam9260: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 07/23] ARM: at91/dt: at91sam9261: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 08/23] ARM: at91/dt: at91sam9263: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 09/23] ARM: at91/dt: at91sam9g45: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 10/23] ARM: at91/dt: at91sam9n12: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 11/23] ARM: at91/dt: at91sam9rl: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 12/23] ARM: at91/dt: at91sam9x5: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 13/23] ARM: at91/dt: sama5d3: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 14/23] ARM: at91/dt: sama5d4: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 15/23] rtc: at91rm9200: get and use slow clock Alexandre Belloni
2015-07-31  9:39 ` [PATCH 16/23] watchdog: at91sam9: " Alexandre Belloni
2015-07-31  9:39 ` [PATCH 17/23] power/reset: at91-reset: remove useless at91_reset_platform_probe() Alexandre Belloni
2015-07-31  9:39 ` [PATCH 18/23] power/reset: at91-reset: get and use slow clock Alexandre Belloni
2015-08-05 18:22   ` Sebastian Reichel
2015-08-10 15:50     ` Alexandre Belloni
2015-08-10 17:11       ` Sebastian Reichel
2015-07-31  9:39 ` [PATCH 19/23] power/reset: at91-poweroff: " Alexandre Belloni
2015-08-05 18:22   ` Sebastian Reichel
2015-07-31  9:39 ` [PATCH 20/23] clocksource: atmel-st: " Alexandre Belloni
2015-07-31  9:39 ` Alexandre Belloni [this message]
2015-07-31  9:39 ` [PATCH 22/23] misc: atmel_tclib: " Alexandre Belloni
2015-08-05 20:45   ` Greg Kroah-Hartman
2015-07-31  9:39 ` [PATCH 23/23] clk: at91: Revert "keep slow clk enabled to prevent system hang" Alexandre Belloni
2015-07-31 19:00   ` Stephen Boyd
2015-07-31 21:09     ` Alexandre Belloni
2015-07-31 21:11       ` Stephen Boyd
2015-07-31 21:27         ` Alexandre Belloni
2015-07-31 21:34           ` Stephen Boyd
2015-07-31 22:24             ` Alexandre Belloni
2015-07-31  9:59 ` [PATCH 00/23] ARM: at91: Properly handle slow clock Boris Brezillon
2015-07-31 10:20   ` Alexandre Belloni
2015-07-31 15:21 ` Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438335599-3301-22-git-send-email-alexandre.belloni@free-electrons.com \
    --to=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®