From 37a2183cca5f5dfac55dae0b1febc97b912f5164 Mon Sep 17 00:00:00 2001
From: Kevin Liu <kliu5@marvell.com>
Date: Wed, 8 Sep 2010 09:44:36 -0400
Subject: [PATCH] --- yaml --- r: 211143 b: refs/heads/master c:
 90182317a9e383474613aa60e9d61d57bdf17c3e h: refs/heads/master i:   211141:
 17e38ac8692c5c092e2a1c678e3d6c5757bd5f71   211139:
 b5c6382fc24060e53e6e174c81a1f585e2ae32a4   211135:
 a670d9ebe0e6d2f18374fe8c2c9b02ef4fc1f435 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/mfd/max8925-core.c | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 17b07b53caf0..a83a52005ae1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9d66d3515bbb0ad8062721487de7ade02d2b936
+refs/heads/master: 90182317a9e383474613aa60e9d61d57bdf17c3e
diff --git a/trunk/drivers/mfd/max8925-core.c b/trunk/drivers/mfd/max8925-core.c
index 04028a9ee082..428377a5a6f5 100644
--- a/trunk/drivers/mfd/max8925-core.c
+++ b/trunk/drivers/mfd/max8925-core.c
@@ -429,24 +429,25 @@ static void max8925_irq_sync_unlock(unsigned int irq)
 	irq_tsc = cache_tsc;
 	for (i = 0; i < ARRAY_SIZE(max8925_irqs); i++) {
 		irq_data = &max8925_irqs[i];
+		/* 1 -- disable, 0 -- enable */
 		switch (irq_data->mask_reg) {
 		case MAX8925_CHG_IRQ1_MASK:
-			irq_chg[0] &= irq_data->enable;
+			irq_chg[0] &= ~irq_data->enable;
 			break;
 		case MAX8925_CHG_IRQ2_MASK:
-			irq_chg[1] &= irq_data->enable;
+			irq_chg[1] &= ~irq_data->enable;
 			break;
 		case MAX8925_ON_OFF_IRQ1_MASK:
-			irq_on[0] &= irq_data->enable;
+			irq_on[0] &= ~irq_data->enable;
 			break;
 		case MAX8925_ON_OFF_IRQ2_MASK:
-			irq_on[1] &= irq_data->enable;
+			irq_on[1] &= ~irq_data->enable;
 			break;
 		case MAX8925_RTC_IRQ_MASK:
-			irq_rtc &= irq_data->enable;
+			irq_rtc &= ~irq_data->enable;
 			break;
 		case MAX8925_TSC_IRQ_MASK:
-			irq_tsc &= irq_data->enable;
+			irq_tsc &= ~irq_data->enable;
 			break;
 		default:
 			dev_err(chip->dev, "wrong IRQ\n");