diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-08-01 20:29:14 +0100 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-11-06 18:28:47 -0800 |
| commit | cc5555872e5c43525050090e1eedd930cd977979 (patch) | |
| tree | 86d5295e6d7085fd7869817569537757cc5b35af /drivers/base | |
| parent | 6685c6f911325866ac70d00503ff93e61ec5b30a (diff) | |
regmap: irq: Only update mask bits when doing initial mask
Don't write the full register, it's possible there's bits other than the
masks in the same register which we shouldn't be changing.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
(cherry picked from commit 0eb46ad0c8d60943c1f46cef795fc537fbffd177)
Change-Id: I4e9f42422e961f9f842ab793227af7be25ca82cf
Signed-off-by: Mallikarjun Kasoju <mkasoju@nvidia.com>
Reviewed-on: http://git-master/r/161549
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap-irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c index c7e5b18f4edc..4a52743b60cd 100644 --- a/drivers/base/regmap/regmap-irq.c +++ b/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); |