sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2016-05-16 19:00:09 -07:00
parent 27d6cafa7e d4ab78d707
commit e2ca54250d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/base/regmap/regcache-flat.c
View File

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

2
drivers/base/regmap/regcache.c
View File

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