summaryrefslogtreecommitdiff
path: root/drivers/base/regmap/regcache-flat.c
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2024-08-28 15:28:34 +0300
committerMark Brown <broonie@kernel.org>2024-08-28 15:52:29 +0300
commitae0acef3822ed8908e83cd24f337891e6be64eba (patch)
tree60c6921dc376497bd3ab73a576bf677754617351 /drivers/base/regmap/regcache-flat.c
parent290d6e5d6498703accffc66849b7fb2d4d7503ff (diff)
downloadlinux-ae0acef3822ed8908e83cd24f337891e6be64eba.tar.xz
regcache: use map->alloc_flags also for allocating cache
Commit fd4ebc07b4df ("regmap: Hold the regmap lock when allocating and freeing the cache") introduced a locking around the allocating and freeing a regmap cache, so adjust the memory allocation flags to the ones given in the regmap configuration instead of the hardcoded GFP_KERNEL. This fixes the "BUG: sleeping function called from invalid context" introduced by the mentioned commit. Fixes: fd4ebc07b4df ("regmap: Hold the regmap lock when allocating and freeing the cache") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://patch.msgid.link/20240828122834.3778031-1-m.szyprowski@samsung.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/base/regmap/regcache-flat.c')
-rw-r--r--drivers/base/regmap/regcache-flat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
index 9b17c77dec9d..f36d3618b67c 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)
return -EINVAL;
map->cache = kcalloc(regcache_flat_get_index(map, map->max_register)
- + 1, sizeof(unsigned int), GFP_KERNEL);
+ + 1, sizeof(unsigned int), map->alloc_flags);
if (!map->cache)
return -ENOMEM;