Unverified Commit 48c6253f authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mark Brown
Browse files

ASoC: samsung: midas_wm1811: Fix 'Headphone Switch' control creation 



'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: d27224a4 ("ASoC: samsung: midas_wm1811: Map missing jack kcontrols")
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20230809100446.2105825-1-m.szyprowski@samsung.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a5ca2aa

sound/soc/samsung/midas_wm1811.c

+0 −1
Original line number Diff line number Diff line
@@ -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"),

};