]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus
authorMark Brown <broonie@kernel.org>
Fri, 4 Sep 2015 16:22:07 +0000 (17:22 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 4 Sep 2015 16:22:07 +0000 (17:22 +0100)
1  2 
drivers/base/regmap/regmap.c

index 9b4badc2479deb43ddd92838b0746b29b70c7d90,fc14a7cc8c859aac6c698f325736043ce53f83fd..c0aeda553c18c72b1547e38149a6f28a5e645358
@@@ -1768,8 -1768,8 +1768,8 @@@ static int _regmap_raw_multi_reg_write(
        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;
@@@ -2184,6 -2184,11 +2184,11 @@@ int regmap_raw_read(struct regmap *map
  
        if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass ||
            map->cache_type == REGCACHE_NONE) {
+               if (!map->bus->read) {
+                       ret = -ENOTSUPP;
+                       goto out;
+               }
                /* Physical block read if there's no cache involved */
                ret = _regmap_raw_read(map, reg, val, val_len);