diff options
| author | Russell King | 2008-10-09 22:33:02 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-09 22:33:02 +0200 |
| commit | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (patch) | |
| tree | 62741c2f78aeb3009c66dbcf014ebff2e034e597 /arch/arm/plat-omap | |
| parent | Merge branch 'at91' into devel (diff) | |
| parent | [ARM] 5239/1: Palm Zire 72 power management support (diff) | |
| download | kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.gz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.tar.xz kernel-qcow2-linux-3f30a09a612bac2b531a206c2a58a292dd7ff182.zip | |
Merge branch 'pxa-all' into devel
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 5764bce98cf3..5935ae4e550b 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -1050,13 +1050,10 @@ static void gpio_irq_handler(unsigned int irq, struct irq_desc *desc) gpio_irq = bank->virtual_irq_start; for (; isr != 0; isr >>= 1, gpio_irq++) { - struct irq_desc *d; - if (!(isr & 1)) continue; - d = irq_desc + gpio_irq; - desc_handle_irq(gpio_irq, d); + generic_handle_irq(gpio_irq); } } /* if bank has any level sensitive GPIO pin interrupt |