From 50c019d89ff9bc04580878fb945c9f630eb0d7fe Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@gmail.com>
Date: Tue, 2 Feb 2010 23:39:35 -0800
Subject: [PATCH] --- yaml --- r: 187476 b: refs/heads/master c:
 2029e5643a3c4fdd4ad20169fb950cc16e023d0c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-mmp/irq-mmp2.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 20032bb29121..4e88f69a3506 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df0c382436df5bdd74030baafa294b75c231ec8c
+refs/heads/master: 2029e5643a3c4fdd4ad20169fb950cc16e023d0c
diff --git a/trunk/arch/arm/mach-mmp/irq-mmp2.c b/trunk/arch/arm/mach-mmp/irq-mmp2.c
index b187c027822d..cb18221c0af3 100644
--- a/trunk/arch/arm/mach-mmp/irq-mmp2.c
+++ b/trunk/arch/arm/mach-mmp/irq-mmp2.c
@@ -102,7 +102,11 @@ static void init_mux_irq(struct irq_chip *chip, int start, int num)
 	int irq;
 
 	for (irq = start; num > 0; irq++, num--) {
-		chip->mask_ack(irq);
+		/* mask and clear the IRQ */
+		chip->mask(irq);
+		if (chip->ack)
+			chip->ack(irq);
+
 		set_irq_chip(irq, chip);
 		set_irq_flags(irq, IRQF_VALID);
 		set_irq_handler(irq, handle_level_irq);