aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/regmap
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-09-04 17:22:07 +0100
committerMark Brown <broonie@kernel.org>2015-09-04 17:22:07 +0100
commitb3959b5cd33383d9fa9b6c653e162331c2af2e08 (patch)
treeb6ffd366400354030da47625aa7181e94104e4e5 /drivers/base/regmap
parent64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff)
parent2f9b660b2128c92d66f18ac7fbd7c39a91cec159 (diff)
downloadlinux-linaro-stable-b3959b5cd33383d9fa9b6c653e162331c2af2e08.tar.gz
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
Diffstat (limited to 'drivers/base/regmap')
-rw-r--r--drivers/base/regmap/regmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7111d04f2621..9b4badc2479d 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1768,8 +1768,8 @@ static int _regmap_raw_multi_reg_write(struct regmap *map,
u8 = buf;
for (i = 0; i < num_regs; i++) {
- int reg = regs[i].reg;
- int val = regs[i].def;
+ unsigned int reg = regs[i].reg;
+ unsigned int val = regs[i].def;
trace_regmap_hw_write_start(map, reg, 1);
map->format.format_reg(u8, reg, map->reg_shift);
u8 += reg_bytes + pad_bytes;