diff options
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/chip.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 6eb3c7952b64..0ad02d76a0c4 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 | ||
@@ -475,7 +476,8 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) | |||
475 | kstat_incr_irqs_this_cpu(irq, desc); | 476 | kstat_incr_irqs_this_cpu(irq, desc); |
476 | 477 | ||
477 | /* Start handling the irq */ | 478 | /* Start handling the irq */ |
478 | desc->chip->ack(irq); | 479 | if (desc->chip->ack) |
480 | desc->chip->ack(irq); | ||
479 | desc = irq_remap_to_desc(irq, desc); | 481 | desc = irq_remap_to_desc(irq, desc); |
480 | 482 | ||
481 | /* Mark the IRQ currently in progress.*/ | 483 | /* Mark the IRQ currently in progress.*/ |