Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

[pandora-kernel.git] / drivers / gpio / gpio-mxc.c

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index b588f8a..b81c989 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -30,6 +30,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <asm-generic/bug.h>
+#include <asm/mach/irq.h>
 
 #define irq_to_gpio(irq)       ((irq) - MXC_GPIO_IRQ_START)
 
@@ -234,10 +235,15 @@ static void mx3_gpio_irq_handler(u32 irq, struct irq_desc *desc)
 {
        u32 irq_stat;
        struct mxc_gpio_port *port = irq_get_handler_data(irq);
+       struct irq_chip *chip = irq_get_chip(irq);
+
+       chained_irq_enter(chip, desc);
 
        irq_stat = readl(port->base + GPIO_ISR) & readl(port->base + GPIO_IMR);
 
        mxc_gpio_irq_handler(port, irq_stat);
+
+       chained_irq_exit(chip, desc);
 }
 
 /* MX2 has one interrupt *for all* gpio ports */