Explorar o código

[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs

The irq_chip is not yet registered, so no default irq_chip.mask_ack(),
which we have to handle it correctly manually here.

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Eric Miao %!s(int64=15) %!d(string=hai) anos
pai
achega
2029e5643a
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      arch/arm/mach-mmp/irq-mmp2.c

+ 5 - 1
arch/arm/mach-mmp/irq-mmp2.c

@@ -102,7 +102,11 @@ static void init_mux_irq(struct irq_chip *chip, int start, int num)
 	int irq;
 
 	for (irq = start; num > 0; irq++, num--) {
-		chip->mask_ack(irq);
+		/* mask and clear the IRQ */
+		chip->mask(irq);
+		if (chip->ack)
+			chip->ack(irq);
+
 		set_irq_chip(irq, chip);
 		set_irq_flags(irq, IRQF_VALID);
 		set_irq_handler(irq, handle_level_irq);