Skip to content

Commit 7d06d97

Browse files
mszyprowgregkh
authored andcommitted
ASoC: samsung: midas_wm1811: Fix 'Headphone Switch' control creation
commit 48c6253fefa38556e0c5c2942edd9181529407e4 upstream. '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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 44c4958 commit 7d06d97

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

sound/soc/samsung/midas_wm1811.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ static const struct snd_kcontrol_new midas_controls[] = {
257257
SOC_DAPM_PIN_SWITCH("Main Mic"),
258258
SOC_DAPM_PIN_SWITCH("Sub Mic"),
259259
SOC_DAPM_PIN_SWITCH("Headset Mic"),
260-
SOC_DAPM_PIN_SWITCH("Headphone"),
261260

262261
SOC_DAPM_PIN_SWITCH("FM In"),
263262
};

0 commit comments

Comments
 (0)