From af68f4625ac040d66a60548b29a6c89d16417ea1 Mon Sep 17 00:00:00 2001 From: Yadwinder Singh Brar Date: Thu, 5 Jul 2012 09:28:21 +0530 Subject: [PATCH] --- yaml --- r: 319751 b: refs/heads/master c: 9bdf9b4ec7c8b707cd0d9109d576c4eb69cd84bb h: refs/heads/master i: 319749: 3f3f72aff2a1184d42f86ee2b18634d2025bf1f8 319747: b593434b38832f4d5f6449b37f81082ba324f247 319743: e5137e7aa1b0bd5d07c9712ad8cfe02f9e1af11b v: v3 --- [refs] | 2 +- trunk/drivers/mfd/max77686-irq.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 28430299a70a..fcf39acf77a5 100644 --- 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 index 09e593ad07b5..0758fac0c447 100644 --- 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);