Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ab78d7 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next

parents 2a2cd521 267c8586 6e4f2878

drivers/base/regmap/regcache-flat.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static int regcache_flat_init(struct regmap *map) 
	int i;

	unsigned int *cache;



	if (!map || map->reg_stride_order < 0)

	if (!map || map->reg_stride_order < 0 || !map->max_register)

		return -EINVAL;



	map->cache = kcalloc(regcache_flat_get_index(map, map->max_register)

drivers/base/regmap/regcache.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ EXPORT_SYMBOL_GPL(regcache_mark_dirty); 
 * regcache_cache_bypass: Put a register map into cache bypass mode

 *

 * @map: map to configure

 * @cache_bypass: flag if changes should not be written to the hardware

 * @cache_bypass: flag if changes should not be written to the cache

 *

 * When a register map is marked with the cache bypass option, writes

 * to the register map API will only update the hardware and not the