| Message ID | 20230809100446.2105825-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 48c6253fefa38556e0c5c2942edd9181529407e4 |
| Headers | show |
| Series | ASoC: samsung: midas_wm1811: Fix 'Headphone Switch' control creation | expand |
On Wed, 09 Aug 2023 12:04:46 +0200, Marek Szyprowski wrote: > 'Headphone Switch' control is already registered from > sound/soc/codecs/wm_hubs.c:479, so duplicating it in midas_wm1811 > causes following probe failure: > > midas-audio sound: control 2:0:0:Headphone Switch:0 is already present > midas-audio sound: ASoC: Failed to add Headphone Switch: -16 > midas-audio sound: Failed to register card: -16 > midas-audio: probe of sound failed with error -16 > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: samsung: midas_wm1811: Fix 'Headphone Switch' control creation commit: 48c6253fefa38556e0c5c2942edd9181529407e4 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
diff --git a/sound/soc/samsung/midas_wm1811.c b/sound/soc/samsung/midas_wm1811.c index 44b32f5cddca..126098fdcf1b 100644 --- a/sound/soc/samsung/midas_wm1811.c +++ b/sound/soc/samsung/midas_wm1811.c @@ -257,7 +257,6 @@ static const struct snd_kcontrol_new midas_controls[] = { SOC_DAPM_PIN_SWITCH("Main Mic"), SOC_DAPM_PIN_SWITCH("Sub Mic"), SOC_DAPM_PIN_SWITCH("Headset Mic"), - SOC_DAPM_PIN_SWITCH("Headphone"), SOC_DAPM_PIN_SWITCH("FM In"), };
'Headphone Switch' control is already registered from sound/soc/codecs/wm_hubs.c:479, so duplicating it in midas_wm1811 causes following probe failure: midas-audio sound: control 2:0:0:Headphone Switch:0 is already present midas-audio sound: ASoC: Failed to add Headphone Switch: -16 midas-audio sound: Failed to register card: -16 midas-audio: probe of sound failed with error -16 Fix this by dropping duplicated control. Fixes: d27224a45e54 ("ASoC: samsung: midas_wm1811: Map missing jack kcontrols") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- sound/soc/samsung/midas_wm1811.c | 1 - 1 file changed, 1 deletion(-)