[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1559298842-15059-1-git-send-email-krzk@kernel.org>
Date: Fri, 31 May 2019 12:34:02 +0200
From: Krzysztof Kozlowski <krzk@...nel.org>
To: Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, alsa-devel@...a-project.org,
linux-kernel@...r.kernel.org
Cc: Tzung-Bi Shih <tzungbi@...gle.com>,
Sylwester Nawrocki <s.nawrocki@...sung.com>,
Krzysztof Kozlowski <krzk@...nel.org>
Subject: [PATCH v2] 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 b19671d6caf1ac393681864d5d85dda9fa99a448.
Signed-off-by: Krzysztof Kozlowski <krzk@...nel.org>
---
Changes since v1:
1. Fix driver name in commit msg.
---
sound/soc/soc-core.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2d3520fca613..7abb017a83f3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3113,10 +3113,7 @@ 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);
+ component->name = fmt_single_name(dev, &component->id);
if (!component->name) {
dev_err(dev, "ASoC: Failed to allocate name\n");
return -ENOMEM;
--
2.7.4
Powered by blists - more mailing lists