diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2019-05-31 12:34:02 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-03 17:46:47 +0100 |
| commit | 9d563eb95b81f32b9ffa4255033717484d50d06b (patch) | |
| tree | a810549896adb928f94ce23a6056257246669a23 /sound/soc/soc-core.c | |
| parent | 1d9c95c1896256a64e3a8d825f9e78cc79d29ebb (diff) | |
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@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 5 |
1 files changed, 1 insertions, 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; |