Revert "ASoC: core: use component driver name as component name"
PATCH v2 1/1 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.
---
Changes since v1:
1. Fix driver name in commit msg.
--- sound/soc/soc-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/soc-core.c +1 -4
@@ -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 ;
Signature · 1 line
2.7.4
Mark Brown
maintainerQuoted 3 lines · Krzysztof Kozlowski
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:
Please use subject lines matching the style for the subsystem. This makes it easier for people to identify relevant patches.
Mark Brown
maintainerApplied "Revert "ASoC: core: use component driver name as component name"" to the asoc tree
In reply to Krzysztof KozlowskiThe patch
Revert "ASoC: core: use component driver name as component name"
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
9d563eb95b81f32b9ffa4255033717484d50d06bMon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <[email protected]>
Date: Fri, 31 May 2019 12:34:02 +0200
Subject: [PATCH] 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.
--- sound/soc/soc-core.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
sound/soc/soc-core.c +1 -4
@@ -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 ;
Signature · 1 line
2.20.1