Merge tag 'for-linus-4.6-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / base / regmap / regcache-flat.c

diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
index 686c9e0b930eff7db5fb5ea01d8760cdf4d5901f..3ee72550b1e3b4ddc8cbaae9c89d0f39778da6d3 100644 (file)
--- a/drivers/base/regmap/regcache-flat.c
+++ b/drivers/base/regmap/regcache-flat.c
@@ -16,20 +16,30 @@
 
 #include "internal.h"
 
+static inline unsigned int regcache_flat_get_index(const struct regmap *map,
+                                                  unsigned int reg)
+{
+       return regcache_get_index_by_order(map, reg);
+}
+
 static int regcache_flat_init(struct regmap *map)
 {
        int i;
        unsigned int *cache;
 
-       map->cache = kcalloc(map->max_register + 1, sizeof(unsigned int),
-                            GFP_KERNEL);
+       if (!map || map->reg_stride_order < 0)
+               return -EINVAL;
+
+       map->cache = kcalloc(regcache_flat_get_index(map, map->max_register)
+                            + 1, sizeof(unsigned int), GFP_KERNEL);
        if (!map->cache)
                return -ENOMEM;
 
        cache = map->cache;
 
        for (i = 0; i < map->num_reg_defaults; i++)
-               cache[map->reg_defaults[i].reg] = map->reg_defaults[i].def;
+               cache[regcache_flat_get_index(map, map->reg_defaults[i].reg)] =
+                               map->reg_defaults[i].def;
 
        return 0;
 }
@@ -47,7 +57,7 @@ static int regcache_flat_read(struct regmap *map,
 {
        unsigned int *cache = map->cache;
 
-       *value = cache[reg];
+       *value = cache[regcache_flat_get_index(map, reg)];
 
        return 0;
 }
@@ -57,7 +67,7 @@ static int regcache_flat_write(struct regmap *map, unsigned int reg,
 {
        unsigned int *cache = map->cache;
 
-       cache[reg] = value;
+       cache[regcache_flat_get_index(map, reg)] = value;
 
        return 0;
 }