diff --git a/[refs] b/[refs] index 8d7718d9523f..855481cf3322 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe5a8b7f0602b5a536d23cd3468461e9de76256b +refs/heads/master: 933036386b36d8a9047798f31ab40f9e869bdd7d diff --git a/trunk/arch/mips/jz4740/gpio.c b/trunk/arch/mips/jz4740/gpio.c index bbbe12ba60ab..e1ddb95c05e3 100644 --- a/trunk/arch/mips/jz4740/gpio.c +++ b/trunk/arch/mips/jz4740/gpio.c @@ -309,7 +309,7 @@ static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc) gpio_irq = chip->irq_base + __fls(flag); - jz_gpio_check_trigger_both(chip, irq); + jz_gpio_check_trigger_both(chip, gpio_irq); generic_handle_irq(gpio_irq); };