---

yaml --- r: 319751 b: refs/heads/master c: 9bdf9b4 h: refs/heads/master i: 319749: 3f3f72a 319747: b593434 319743: e5137e7 v: v3
git-mirror · Jul 9, 2012 · af68f46 · af68f46
1 parent 8be1b71
commit af68f46
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84d70ee78bb0c3d8d1d8df74565d010e2e3c31a9
+refs/heads/master: 9bdf9b4ec7c8b707cd0d9109d576c4eb69cd84bb
diff --git a/trunk/drivers/mfd/max77686-irq.c b/trunk/drivers/mfd/max77686-irq.c
@@ -208,6 +208,9 @@ static irqreturn_t max77686_irq_thread(int irq, void *data)
 
 	}
 
+	for (i = 0; i < MAX77686_IRQ_GROUP_NR; i++)
+		irq_reg[i] &= ~max77686->irq_masks_cur[i];
+
 	for (i = 0; i < MAX77686_IRQ_NR; i++) {
 		if (irq_reg[max77686_irqs[i].group] & max77686_irqs[i].mask) {
 			cur_irq = irq_find_mapping(max77686->irq_domain, i);