From 2029e5643a3c4fdd4ad20169fb950cc16e023d0c Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Tue, 2 Feb 2010 23:39:35 -0800 Subject: [PATCH] [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 Signed-off-by: Eric Miao --- arch/arm/mach-mmp/irq-mmp2.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mmp/irq-mmp2.c b/arch/arm/mach-mmp/irq-mmp2.c index b187c027822d..cb18221c0af3 100644 --- a/arch/arm/mach-mmp/irq-mmp2.c +++ b/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);