summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChao Xie <xiechao.mail@gmail.com>2012-07-31 08:13:09 +0200
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-08-16 10:15:54 +0200
commit0d2ee5d773c209504db643ec4d4b9f3624a6663f (patch)
treea0d0bccd073403b73891cb9283891f558ce0ecb2
parentARM: pxa: support CKENC in clk_enable (diff)
downloadlinux-0d2ee5d773c209504db643ec4d4b9f3624a6663f.tar.xz
linux-0d2ee5d773c209504db643ec4d4b9f3624a6663f.zip
gpio: pxa: add chain_eneter and chain_exit for irq handler
Signed-off-by: Chao Xie <xiechao.mail@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
-rw-r--r--drivers/gpio/gpio-pxa.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 6d0cb9dff27d..db5c2958f973 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -26,6 +26,8 @@
#include <linux/syscore_ops.h>
#include <linux/slab.h>
+#include <asm/mach/irq.h>
+
#include <mach/irqs.h>
/*
@@ -331,6 +333,9 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
struct pxa_gpio_chip *c;
int loop, gpio, gpio_base, n;
unsigned long gedr;
+ struct irq_chip *chip = irq_desc_get_chip(desc);
+
+ chained_irq_enter(chip, desc);
do {
loop = 0;
@@ -350,6 +355,8 @@ static void pxa_gpio_demux_handler(unsigned int irq, struct irq_desc *desc)
}
}
} while (loop);
+
+ chained_irq_exit(chip, desc);
}
static void pxa_ack_muxed_gpio(struct irq_data *d)