While freeing interrupt handlers in error path, don't assume that all
requested interrupts are per-processor interrupts and properly release
standard interrupts too.

Suggested-by: Krzysztof Kozlowski <k...@kernel.org>
Fixes: 56a94f13919c ("clocksource: exynos_mct: Avoid blocking calls in the cpu 
hotplug notifier")
Signed-off-by: Marek Szyprowski <m.szyprow...@samsung.com>
---
 drivers/clocksource/exynos_mct.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 43b335ff4a96..a379f11fad2d 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -562,7 +562,19 @@ static int __init exynos4_timer_resources(struct 
device_node *np, void __iomem *
        return 0;
 
 out_irq:
-       free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick);
+       if (mct_int_type == MCT_INT_PPI) {
+               free_percpu_irq(mct_irqs[MCT_L0_IRQ], &percpu_mct_tick);
+       } else {
+               for_each_possible_cpu(cpu) {
+                       struct mct_clock_event_device *pcpu_mevt =
+                               per_cpu_ptr(&percpu_mct_tick, cpu);
+
+                       if (pcpu_mevt->evt.irq != -1) {
+                               free_irq(pcpu_mevt->evt.irq, pcpu_mevt);
+                               pcpu_mevt->evt.irq = -1;
+                       }
+               }
+       }
        return err;
 }
 
-- 
2.17.1

Reply via email to