tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Mark Brown d4ab78d7 2a2cd521

+2 -2
+1 -1
drivers/base/regmap/regcache-flat.c
··· 27 27 int i; 28 28 unsigned int *cache; 29 29 30 - if (!map || map->reg_stride_order < 0) 30 + if (!map || map->reg_stride_order < 0 || !map->max_register) 31 31 return -EINVAL; 32 32 33 33 map->cache = kcalloc(regcache_flat_get_index(map, map->max_register)
+1 -1
drivers/base/regmap/regcache.c
··· 529 529 * regcache_cache_bypass: Put a register map into cache bypass mode 530 530 * 531 531 * @map: map to configure 532 - * @cache_bypass: flag if changes should not be written to the hardware 532 + * @cache_bypass: flag if changes should not be written to the cache 533 533 * 534 534 * When a register map is marked with the cache bypass option, writes 535 535 * to the register map API will only update the hardware and not the