diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 19:00:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-16 19:00:09 -0700 |
| commit | e2ca54250d14347c35c55e9304296c2f04f3fbad (patch) | |
| tree | a441ff32911dbaca0586f1d1dfeeded828867758 /drivers | |
| parent | 27d6cafa7e10ca0f97b57ea4da2d8a73e41d6e65 (diff) | |
| parent | d4ab78d7076d2a58a2d690b2f4a03a24d978ac1c (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/regmap/regcache-flat.c | 2 | ||||
| -rw-r--r-- | drivers/base/regmap/regcache.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c index 3ee72550b1e3..4d2e50bfc726 100644 --- a/drivers/base/regmap/regcache-flat.c +++ b/drivers/base/regmap/regcache-flat.c @@ -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) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 4170b7d95276..df7ff7290821 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -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 |