summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-01-11 11:48:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2022-01-11 11:48:51 -0800
commit2d7852c3794085920e50e69bd050881d605bd44d (patch)
treed7861a3f9814a41376ea0d7046b41d141e658f8d /drivers
parentc01d85c2190bf694ccd041e7d19c36eacf005840 (diff)
parentb56a7cbf40c895cbe8b67ce5649a26b7a7bc48be (diff)
Merge tag 'regmap-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown: "A very quiet release for regmap: - Allow a custom _update_bits() operation for devices with no bus. - Fix an issue with creation of the debugfs directory when attaching a device to an existing no device regmap. - A trivial formatting fix" [ The custom _update_bits comit came in earlier through the networking tree that had merged it for its own needs ] * tag 'regmap-v5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: debugfs: Fix indentation regmap: Call regmap_debugfs_exit() prior to _init()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/regmap/regmap-debugfs.c2
-rw-r--r--drivers/base/regmap/regmap.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index ad684d37c2da..817eda2075aa 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -598,7 +598,7 @@ void regmap_debugfs_init(struct regmap *map)
map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d",
dummy_index);
if (!map->debugfs_name)
- return;
+ return;
name = map->debugfs_name;
dummy_index++;
}
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 2d74f9f82aa9..8f9fe5fd4707 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -647,6 +647,7 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
if (ret)
return ret;
+ regmap_debugfs_exit(map);
regmap_debugfs_init(map);
/* Add a devres resource for dev_get_regmap() */