diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-02-02 23:39:35 -0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-03-02 07:40:57 +0800 |
| commit | 2029e5643a3c4fdd4ad20169fb950cc16e023d0c (patch) | |
| tree | 8cb48739ffee9cf11522ccc1d907f3f17857a065 | |
| parent | df0c382436df5bdd74030baafa294b75c231ec8c (diff) | |
| download | linux-3.10-2029e5643a3c4fdd4ad20169fb950cc16e023d0c.tar.gz linux-3.10-2029e5643a3c4fdd4ad20169fb950cc16e023d0c.tar.bz2 linux-3.10-2029e5643a3c4fdd4ad20169fb950cc16e023d0c.zip | |
[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>
| -rw-r--r-- | arch/arm/mach-mmp/irq-mmp2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/irq-mmp2.c b/arch/arm/mach-mmp/irq-mmp2.c index b187c027822..cb18221c0af 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); |