diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-05 15:30:22 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-05 15:30:22 +0300 |
| commit | 0e03ae7492271a62f6085c9c7f301ac8a481b001 (patch) | |
| tree | 11fd8127c27b0642358df42ad793a5327d25d47d /drivers/base | |
| parent | fc77dbd34c5c99bce46d40a2491937c3bcbd10af (diff) | |
| parent | d51fe1f393a6b99e9133a3360036af2c21983ec2 (diff) | |
| download | linux-0e03ae7492271a62f6085c9c7f301ac8a481b001.tar.xz | |
Merge remote-tracking branch 'regmap/fix/raw' into regmap-linus
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 348be3a35410..5c5090b68939 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -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; |