From 62c3def1c313be67865844699e03d4d54ae8b21f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sun, 3 Jun 2012 13:37:23 +0100
Subject: [PATCH] --- yaml --- r: 319700 b: refs/heads/master c:
 7fdb5d32614f7784fc7c2b8e883eb4da26358a94 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/mfd/wm8350-irq.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d7bafe32fc5d..a6c3a913a4df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52b461b86a9f6c7a86bdcb858e1bbef089fbe6a0
+refs/heads/master: 7fdb5d32614f7784fc7c2b8e883eb4da26358a94
diff --git a/trunk/drivers/mfd/wm8350-irq.c b/trunk/drivers/mfd/wm8350-irq.c
index 9fd01bf63c51..624ff90501cd 100644
--- a/trunk/drivers/mfd/wm8350-irq.c
+++ b/trunk/drivers/mfd/wm8350-irq.c
@@ -432,11 +432,9 @@ static void wm8350_irq_sync_unlock(struct irq_data *data)
 	for (i = 0; i < ARRAY_SIZE(wm8350->irq_masks); i++) {
 		/* If there's been a change in the mask write it back
 		 * to the hardware. */
-		if (wm8350->irq_masks[i] !=
-		    wm8350->reg_cache[WM8350_INT_STATUS_1_MASK + i])
-			WARN_ON(wm8350_reg_write(wm8350,
-					 WM8350_INT_STATUS_1_MASK + i,
-						 wm8350->irq_masks[i]));
+		WARN_ON(regmap_update_bits(wm8350->regmap,
+					   WM8350_INT_STATUS_1_MASK + i,
+					   0xffff, wm8350->irq_masks[i]));
 	}
 
 	mutex_unlock(&wm8350->irq_lock);