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

Commit e2ca5425 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap updates from Mark Brown:
 "The updates for this kernel release really are trivial:

   - Check that max_register is set for the flat cache to avoid a crash
     on initialization

   - Fix a typo in the documentation"

* tag 'regmap-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regcache: flat: Require max_registers to be set
  regmap: cache: Fix typo in cache_bypass parameter description
parents 27d6cafa d4ab78d7

drivers/base/regmap/regcache-flat.c

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

	int i;

	unsigned int *cache;

	unsigned int *cache;





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

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

		return -EINVAL;

		return -EINVAL;





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

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

drivers/base/regmap/regcache.c

+1 −1
Original line number Original line 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

 * regcache_cache_bypass: Put a register map into cache bypass mode

 *

 *

 * @map: map to configure

 * @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

 * 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

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