53 lines
1.7 KiB
Diff
53 lines
1.7 KiB
Diff
|
From 0b21bbfb246888fddefb107373ab1ae00e3a963a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
|
||
|
|
Date: Thu, 17 Mar 2016 21:09:43 +0100
|
||
|
|
Subject: [PATCH 057/365] clockevents/drivers/timer-atmel-pit: fix double
|
||
|
|
free_irq
|
||
|
|
|
||
|
|
clockevents_exchange_device() changes the state from detached to shutdown
|
||
|
|
and so at that point the IRQ has not yet been requested.
|
||
|
|
|
||
|
|
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
|
||
|
|
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
|
||
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
||
|
|
---
|
||
|
|
drivers/clocksource/timer-atmel-pit.c | 8 +++++++-
|
||
|
|
1 file changed, 7 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
|
||
|
|
index 2c66bb3e595b..93288849b2bd 100644
|
||
|
|
--- a/drivers/clocksource/timer-atmel-pit.c
|
||
|
|
+++ b/drivers/clocksource/timer-atmel-pit.c
|
||
|
|
@@ -46,6 +46,7 @@ struct pit_data {
|
||
|
|
u32 cycle;
|
||
|
|
u32 cnt;
|
||
|
|
unsigned int irq;
|
||
|
|
+ bool irq_requested;
|
||
|
|
struct clk *mck;
|
||
|
|
};
|
||
|
|
|
||
|
|
@@ -96,7 +97,10 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
|
||
|
|
|
||
|
|
/* disable irq, leaving the clocksource active */
|
||
|
|
pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
|
||
|
|
- free_irq(data->irq, data);
|
||
|
|
+ if (data->irq_requested) {
|
||
|
|
+ free_irq(data->irq, data);
|
||
|
|
+ data->irq_requested = false;
|
||
|
|
+ }
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -115,6 +119,8 @@ static int pit_clkevt_set_periodic(struct clock_event_device *dev)
|
||
|
|
if (ret)
|
||
|
|
panic(pr_fmt("Unable to setup IRQ\n"));
|
||
|
|
|
||
|
|
+ data->irq_requested = true;
|
||
|
|
+
|
||
|
|
/* update clocksource counter */
|
||
|
|
data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
|
||
|
|
pit_write(data->base, AT91_PIT_MR,
|
||
|
|
--
|
||
|
|
2.28.0
|
||
|
|
|