diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2011-09-23 20:29:54 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-10-24 18:34:25 -0400 |
commit | 933036386b36d8a9047798f31ab40f9e869bdd7d (patch) | |
tree | b600ab160ca792ae0e89f9d7b44d8ff5351930ab | |
parent | fe5a8b7f0602b5a536d23cd3468461e9de76256b (diff) |
MIPS: JZ4740: GPIO: Check correct IRQ in demux handler
Check the trigger direction for the triggered IRQ instead of the parent IRQ.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: http://patchwork.linux-mips.org/patch/2433/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/jz4740/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c index bbbe12ba60ab..e1ddb95c05e3 100644 --- a/arch/mips/jz4740/gpio.c +++ b/arch/mips/jz4740/gpio.c | |||
@@ -309,7 +309,7 @@ static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc) | |||
309 | 309 | ||
310 | gpio_irq = chip->irq_base + __fls(flag); | 310 | gpio_irq = chip->irq_base + __fls(flag); |
311 | 311 | ||
312 | jz_gpio_check_trigger_both(chip, irq); | 312 | jz_gpio_check_trigger_both(chip, gpio_irq); |
313 | 313 | ||
314 | generic_handle_irq(gpio_irq); | 314 | generic_handle_irq(gpio_irq); |
315 | }; | 315 | }; |