aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/ipu/ipu_irq.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/dma/ipu/ipu_irq.c b/drivers/dma/ipu/ipu_irq.c
index fc6506b12278..7489d2a5d246 100644
--- a/drivers/dma/ipu/ipu_irq.c
+++ b/drivers/dma/ipu/ipu_irq.c
@@ -341,9 +341,7 @@ int __init ipu_irq_attach_irq(struct ipu *ipu, struct platform_device *dev)
341 irq_map[i].irq = irq; 341 irq_map[i].irq = irq;
342 irq_map[i].source = -EINVAL; 342 irq_map[i].source = -EINVAL;
343 irq_set_handler(irq, handle_level_irq); 343 irq_set_handler(irq, handle_level_irq);
344#ifdef CONFIG_ARM 344 irq_clear_status_flags(irq, IRQ_NOREQUEST | IRQ_NOPROBE);
345 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
346#endif
347 } 345 }
348 346
349 irq_set_chained_handler_and_data(ipu->irq_fn, ipu_irq_handler, ipu); 347 irq_set_chained_handler_and_data(ipu->irq_fn, ipu_irq_handler, ipu);
@@ -366,9 +364,7 @@ void ipu_irq_detach_irq(struct ipu *ipu, struct platform_device *dev)
366 irq_set_chained_handler_and_data(ipu->irq_err, NULL, NULL); 364 irq_set_chained_handler_and_data(ipu->irq_err, NULL, NULL);
367 365
368 for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) { 366 for (irq = irq_base; irq < irq_base + CONFIG_MX3_IPU_IRQS; irq++) {
369#ifdef CONFIG_ARM 367 irq_set_status_flags(irq, IRQ_NOREQUEST);
370 set_irq_flags(irq, 0);
371#endif
372 irq_set_chip(irq, NULL); 368 irq_set_chip(irq, NULL);
373 irq_set_chip_data(irq, NULL); 369 irq_set_chip_data(irq, NULL);
374 } 370 }