From b91898f1710f229db1b5b6dc59ce4bad3982fcf8 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 1 Aug 2012 20:29:14 +0100
Subject: [PATCH] --- yaml --- r: 323292 b: refs/heads/master c:
 0eb46ad0c8d60943c1f46cef795fc537fbffd177 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/base/regmap/regmap-irq.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2cf88bfbd19c..076a6267c53f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16032624f511b2fac0671cba5e7da40aa7e73a66
+refs/heads/master: 0eb46ad0c8d60943c1f46cef795fc537fbffd177
diff --git a/trunk/drivers/base/regmap/regmap-irq.c b/trunk/drivers/base/regmap/regmap-irq.c
index c7e5b18f4edc..4a52743b60cd 100644
--- a/trunk/drivers/base/regmap/regmap-irq.c
+++ b/trunk/drivers/base/regmap/regmap-irq.c
@@ -306,7 +306,8 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
 		d->mask_buf[i] = d->mask_buf_def[i];
 		reg = chip->mask_base +
 			(i * map->reg_stride * d->irq_reg_stride);
-		ret = regmap_write(map, reg, d->mask_buf[i]);
+		ret = regmap_update_bits(map, reg,
+					 d->mask_buf[i], d->mask_buf[i]);
 		if (ret != 0) {
 			dev_err(map->dev, "Failed to set masks in 0x%x: %d\n",
 				reg, ret);