Unverified Commit 9d563eb9 authored May 31, 2019 by Krzysztof Kozlowski Committed by Mark Brown Jun 03, 2019

Revert "ASoC: core: use component driver name as component name"



Using component driver as a name is not unique and it breaks audio in
certain configurations, e.g. Hardkernel Odroid XU3 board where following
components are registered:
 - "3830000.i2s" with driver name "snd_dmaengine_pcm"
 - "3830000.i2s-sec" with driver name "snd_dmaengine_pcm"
 - "3830000.i2s" with driver name "samsung-i2s"

This reverts commit b19671d6.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 1d9c95c1

sound/soc/soc-core.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -3113,9 +3113,6 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
		{
		struct snd_soc_dapm_context *dapm;

		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");

Admin message