commit c946160e601c70a0ae0aa807461dd0232bcaf3a7
author Linus Torvalds <torvalds@g5.osdl.org> Fri Feb 24 16:00:36 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Feb 24 16:00:36 2006 -0800
tree 0554732c1bb8ff38dac0ad143a6f455de11677f9
parent 2cb5b6beef3a3357ef1f2a580d5e2284516efc39
parent abbea7187296a7fb316a55f2319438c2bf881f0a

Merge master.kernel.org:/home/rmk/linux-2.6-arm

arch/arm/mach-at91rm9200/gpio.c

diff --git a/arch/arm/mach-at91rm9200/gpio.c b/arch/arm/mach-at91rm9200/gpio.c
index a9f718b..0e396fe 100644
--- a/arch/arm/mach-at91rm9200/gpio.c
+++ b/arch/arm/mach-at91rm9200/gpio.c
@@ -274,8 +274,18 @@
 		gpio = &irq_desc[pin];
 
 		while (isr) {
-			if (isr & 1)
-				gpio->handle(pin, gpio, regs);
+			if (isr & 1) {
+				if (unlikely(gpio->disable_depth)) {
+					/*
+					 * The core ARM interrupt handler lazily disables IRQs so
+					 * another IRQ must be generated before it actually gets
+					 * here to be disabled on the GPIO controller.
+					 */
+					gpio_irq_mask(pin);
+				}
+				else
+					gpio->handle(pin, gpio, regs);
+			}
 			pin++;
 			gpio++;
 			isr >>= 1;