diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-01-20 14:35:31 -0300 |
| commit | cd07e536b0201fceffd90a701bfb1e1fc07fcd34 (patch) | |
| tree | 4777d4b2f749b279fc07bd41f11b88c9e4578afe /drivers/base/regmap/regmap-debugfs.c | |
| parent | perf tools: Add 'ping' control command (diff) | |
| parent | Merge tag 'task_work-2021-01-19' of git://git.kernel.dk/linux-block (diff) | |
| download | linux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.tar.gz linux-cd07e536b0201fceffd90a701bfb1e1fc07fcd34.zip | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/base/regmap/regmap-debugfs.c')
| -rw-r--r-- | drivers/base/regmap/regmap-debugfs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c index 8dfac7f3ed7a..ff2ee87987c7 100644 --- a/drivers/base/regmap/regmap-debugfs.c +++ b/drivers/base/regmap/regmap-debugfs.c @@ -582,8 +582,12 @@ void regmap_debugfs_init(struct regmap *map) devname = dev_name(map->dev); if (name) { - map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s", + if (!map->debugfs_name) { + map->debugfs_name = kasprintf(GFP_KERNEL, "%s-%s", devname, name); + if (!map->debugfs_name) + return; + } name = map->debugfs_name; } else { name = devname; @@ -591,9 +595,10 @@ void regmap_debugfs_init(struct regmap *map) if (!strcmp(name, "dummy")) { kfree(map->debugfs_name); - map->debugfs_name = kasprintf(GFP_KERNEL, "dummy%d", dummy_index); + if (!map->debugfs_name) + return; name = map->debugfs_name; dummy_index++; } |