summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2023-08-09 12:04:46 +0200
committerMark Brown <broonie@kernel.org>2023-08-09 13:52:36 +0200
commit48c6253fefa38556e0c5c2942edd9181529407e4 (patch)
tree3e4d468283dfdd9fec7379cceb2b52916b679917 /sound/soc
parentASoC: rsnd: call of_node_put() when break (diff)
downloadlinux-48c6253fefa38556e0c5c2942edd9181529407e4.tar.xz
linux-48c6253fefa38556e0c5c2942edd9181529407e4.zip
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: d27224a45e54 ("ASoC: samsung: midas_wm1811: Map missing jack kcontrols") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20230809100446.2105825-1-m.szyprowski@samsung.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/samsung/midas_wm1811.c1
1 files changed, 0 insertions, 1 deletions
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"),
};