diff options
author | Mark Brown <broonie@kernel.org> | 2014-11-21 11:32:33 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-11-21 11:32:33 +0000 |
commit | 28176ab6d0c3def4d5c1f3c37e560b0093c58547 (patch) | |
tree | bac3c3dccd0cc6451617a4ea9879674a0fb35d6b /drivers | |
parent | fc14f9c1272f62c3e8d01300f52467c0d9af50f9 (diff) | |
parent | 439e8211a78ad31615c76b18e4f13eb900c89758 (diff) |
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/base/regmap/regcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index f1280dc356d0..44e6a48019a5 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -44,7 +44,7 @@ static int regcache_hw_init(struct regmap *map) map->cache_bypass = 1; tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL); if (!tmp_buf) - return -EINVAL; + return -ENOMEM; ret = regmap_raw_read(map, 0, tmp_buf, map->num_reg_defaults_raw); map->cache_bypass = cache_bypass; |