| Message ID | 20190529062214.225874-1-tzungbi@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b19671d6caf1ac393681864d5d85dda9fa99a448 |
| Headers | show |
| Series | ASoC: core: use component driver name as component name | expand |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7abb017a83f3..2d3520fca613 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3113,7 +3113,10 @@ static int snd_soc_component_initialize(struct snd_soc_component *component, { struct snd_soc_dapm_context *dapm; - component->name = fmt_single_name(dev, &component->id); + if (driver->name) + component->name = kstrdup(driver->name, GFP_KERNEL); + else + component->name = fmt_single_name(dev, &component->id); if (!component->name) { dev_err(dev, "ASoC: Failed to allocate name\n"); return -ENOMEM;
fmt_single_name() uses device name to determine component name. If multiple components bind to the same device, the debugfs creation in soc_init_component_debugfs() would fail due to duplicated entity names. Name provided by component driver is unique enough to represent each component. Use component driver name as the component name to avoid name duplication. Signed-off-by: Tzung-Bi Shih <tzungbi@google.com> --- Hi, We got "Failed to create component debugfs directory" in our environment. But the patch does not resolve the issue. (https://mailman.alsa-project.org/pipermail/alsa-devel/2018-February/132391.html) The entity name duplicated when creating the debugfs directory, because there is a device registered 2 components in mt8183_afe_pcm_dev_probe() in sound/soc/mediatek/mt8183/mt8183-afe-pcm.c. sound/soc/soc-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)