---

yaml --- r: 187476 b: refs/heads/master c: 2029e56 h: refs/heads/master v: v3
git-mirror · Mar 1, 2010 · 50c019d · 50c019d
1 parent bdae0d0
commit 50c019d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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);