Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: fix card registration regression.

Browse Source 
This reverts commit b2354e4009.

This change might have been desirable to ensure the uniqueness of
the component name. It would have helped to better support linux
devices which register multiple components, something is which more
common than initially thought.

However, some card driver are directly using dev_name() to fill the
component names of the dai_link which is a problem if want to change
the way ASoC generates the component names.

Until we figure out the appropriate way to deal with this, revert the
change and keep the names as they were. There might be a couple of warning
related to debugfs (which were already present before the change) but it
is still better than breaking working audio cards.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20200219102526.692126-1-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Jerome Brunet 2020-02-19 11:25:26 +01:00 committed by Mark Brown
parent eaa2330bfc
commit 6b62fa95b5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/soc-core.c
View File

@ -2442,33 +2442,6 @@ err:
return ret;
}
static char *snd_soc_component_unique_name(struct device *dev,
struct snd_soc_component *component)
{
struct snd_soc_component *pos;
int count = 0;
char *name, *unique;
name = fmt_single_name(dev, &component->id);
if (!name)
return name;
/* Count the number of components registred by the device */
for_each_component(pos) {
if (dev == pos->dev)
count++;
}
/* Keep naming as it is for the 1st component */
if (!count)
return name;
unique = devm_kasprintf(dev, GFP_KERNEL, "%s-%d", name, count);
devm_kfree(dev, name);
return unique;
}
static int snd_soc_component_initialize(struct snd_soc_component *component,
const struct snd_soc_component_driver *driver, struct device *dev)
{
@ -2477,7 +2450,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
INIT_LIST_HEAD(&component->card_list);
mutex_init(&component->io_mutex);
component->name = snd_soc_component_unique_name(dev, component);
component->name = fmt_single_name(dev, &component->id);
if (!component->name) {
dev_err(dev, "ASoC: Failed to allocate name\n");
return -ENOMEM;