---

yaml --- r: 323292 b: refs/heads/master c: 0eb46ad h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · b91898f · b91898f
1 parent 288de69
commit b91898f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);