From 70a65701ade99233d675f9026871e93e6479a056 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Mon, 21 Feb 2011 14:54:57 +0000
Subject: [PATCH] --- yaml --- r: 249987 b: refs/heads/master c:
 03dd765fe4dd9420ac430d2a7c19498afa4431b3 h: refs/heads/master i:   249985:
 2bf7e34329f2064f4d81827558a63cae0862590e   249983:
 fd99b50bd843b13a6f04ed28185988c4ac79b186 v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-msm/gpio-v2.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 15f335c5fd2a..d52e4bcf8a21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f43563f2d9d8f6f9e0727e4eedb7f557ed2fb4c
+refs/heads/master: 03dd765fe4dd9420ac430d2a7c19498afa4431b3
diff --git a/trunk/arch/arm/mach-msm/gpio-v2.c b/trunk/arch/arm/mach-msm/gpio-v2.c
index 56a964e52ad3..cc9c4fd7cccc 100644
--- a/trunk/arch/arm/mach-msm/gpio-v2.c
+++ b/trunk/arch/arm/mach-msm/gpio-v2.c
@@ -27,6 +27,9 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/spinlock.h>
+
+#include <asm/mach/irq.h>
+
 #include <mach/msm_iomap.h>
 #include "gpiomux.h"
 
@@ -309,8 +312,10 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)
  */
 static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
-	struct irq_data *data = irq_desc_get_irq_data(desc);
 	unsigned long i;
+	struct irq_chip *chip = irq_desc_get_chip(desc);
+
+	chained_irq_enter(chip, desc);
 
 	for (i = find_first_bit(msm_gpio.enabled_irqs, NR_GPIO_IRQS);
 	     i < NR_GPIO_IRQS;
@@ -319,7 +324,8 @@ static void msm_summary_irq_handler(unsigned int irq, struct irq_desc *desc)
 			generic_handle_irq(msm_gpio_to_irq(&msm_gpio.gpio_chip,
 							   i));
 	}
-	data->chip->irq_ack(data);
+
+	chained_irq_exit(chip, desc);
 }
 
 static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)