regmap: pass buffer size to regmap_raw_read() in regcache_hw_init()
authorMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Wed, 13 Jan 2016 21:41:12 +0000 (22:41 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 15 Jan 2016 18:14:14 +0000 (18:14 +0000)
regcache_hw_init() uses regmap_raw_read() to initialize cache
when reg_defaults_raw isn't provided.

The last parameter to regmap_raw_read() is buffer size in bytes,
however regcache_hw_init() called it with number of registers
to read instead, which cause problem if they aren't one byte
wide in cache.

This wasn't triggered by any of current in-tree drivers
since they either have one-byte registers or provide
reg_defaults_raw explicitly.

Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/base/regmap/regcache.c

index 4c07802986b2c92862e1f0242eebddcb42e2b45d..45ae91eb6be9cda1af96554f65a8e4020cffcf0c 100644 (file)
@@ -57,7 +57,7 @@ static int regcache_hw_init(struct regmap *map)
                bool cache_bypass = map->cache_bypass;
                dev_warn(map->dev, "No cache defaults, reading back from HW\n");
 
-               /* Bypass the cache access till data read from HW*/
+               /* Bypass the cache access till data read from HW */
                map->cache_bypass = true;
                tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
                if (!tmp_buf) {
@@ -65,7 +65,7 @@ static int regcache_hw_init(struct regmap *map)
                        goto err_free;
                }
                ret = regmap_raw_read(map, 0, tmp_buf,
-                                     map->num_reg_defaults_raw);
+                                     map->cache_size_raw);
                map->cache_bypass = cache_bypass;
                if (ret < 0)
                        goto err_cache_free;