Commit 28176ab6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus

parents fc14f9c1 439e8211
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;