aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/irq/chip.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/irq/chip.c')
-rw-r--r--kernel/irq/chip.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 7de11bd64dfe..55d526c0eefd 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -290,7 +290,8 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq)
290 desc->chip->mask_ack(irq); 290 desc->chip->mask_ack(irq);
291 else { 291 else {
292 desc->chip->mask(irq); 292 desc->chip->mask(irq);
293 desc->chip->ack(irq); 293 if (desc->chip->ack)
294 desc->chip->ack(irq);
294 } 295 }
295} 296}
296 297
@@ -476,7 +477,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
476 kstat_incr_irqs_this_cpu(irq, desc); 477 kstat_incr_irqs_this_cpu(irq, desc);
477 478
478 /* Start handling the irq */ 479 /* Start handling the irq */
479 desc->chip->ack(irq); 480 if (desc->chip->ack)
481 desc->chip->ack(irq);
480 desc = irq_remap_to_desc(irq, desc); 482 desc = irq_remap_to_desc(irq, desc);
481 483
482 /* Mark the IRQ currently in progress.*/ 484 /* Mark the IRQ currently in progress.*/