diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 17:22:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 17:22:07 +0100 |
| commit | b3959b5cd33383d9fa9b6c653e162331c2af2e08 (patch) | |
| tree | b6ffd366400354030da47625aa7181e94104e4e5 /drivers/base | |
| parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) | |
| parent | 2f9b660b2128c92d66f18ac7fbd7c39a91cec159 (diff) | |
| download | linux-b3959b5cd33383d9fa9b6c653e162331c2af2e08.tar.gz linux-b3959b5cd33383d9fa9b6c653e162331c2af2e08.tar.bz2 linux-b3959b5cd33383d9fa9b6c653e162331c2af2e08.zip | |
Merge remote-tracking branch 'regmap/fix/core' into regmap-linus
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regmap.c | 4 |
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; |