diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 09:11:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 09:11:22 -0700 |
| commit | 12a5146bda2f21728bdd475f10e5785fc62c9c29 (patch) | |
| tree | 58ad20ec47632419abc4716d418056874fca80a3 /drivers/base/regmap/regmap-debugfs.c | |
| parent | 2ec98f567888501df0140c858af5f5ea10216a6f (diff) | |
| parent | aaccf3863ce22108ae1d3bac82604eec9d8ae44c (diff) | |
| download | linux-12a5146bda2f21728bdd475f10e5785fc62c9c29.tar.gz linux-12a5146bda2f21728bdd475f10e5785fc62c9c29.tar.bz2 linux-12a5146bda2f21728bdd475f10e5785fc62c9c29.zip | |
Merge tag 'regmap-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown:
"This is a relatively busy release for regmap, though not busy in the
grand scheme of things, with the addition of support for I3C from
Vitor Soares and a few small fixes and cleanups"
* tag 'regmap-v5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: select CONFIG_REGMAP while REGMAP_SCCB is set
regmap: lzo: Switch to bitmap_zalloc()
regmap: fix bulk writes on paged registers
regmap: add i3c bus support
regmap: debugfs: Fix memory leak in regmap_debugfs_init
Diffstat (limited to 'drivers/base/regmap/regmap-debugfs.c')
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 263f82516ff4..e5e1b3a01b1a 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -579,6 +579,8 @@ void regmap_debugfs_init(struct regmap *map, const char *name) } if (!strcmp(name, "dummy")) { + kfree(map->debugfs_name); + map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d", dummy_index); name = map->debugfs_name; |