]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'regmap/topic/core' into regmap-next
authorMark Brown <broonie@linaro.org>
Wed, 12 Jun 2013 15:28:10 +0000 (16:28 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 12 Jun 2013 15:28:10 +0000 (16:28 +0100)
1  2 
drivers/base/regmap/regmap.c

index 1a01553189b34e321ad4b9c9db031c72b7546dbd,2f1f3ff6c6bf9061361c82bb4dfb1feb3b601677..ed152e3d2d88fed6dbf2a67a4055bd60685cd885
@@@ -121,9 -121,12 +121,12 @@@ bool regmap_volatile(struct regmap *map
                return map->volatile_reg(map->dev, reg);
  
        if (map->volatile_table)
 -              return _regmap_check_range_table(map, reg, map->volatile_table);
 +              return regmap_check_range_table(map, reg, map->volatile_table);
  
-       return true;
+       if (map->cache_ops)
+               return false;
+       else
+               return true;
  }
  
  bool regmap_precious(struct regmap *map, unsigned int reg)