xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Brown
2016-05-13 10:36:14 +01:00
parent 2a2cd52190 267c858603 6e4f28780f
commit d4ab78d707
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; 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)

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