Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e236d4d7 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: smdk_wm8580: Pass card DAPM context to snd_soc_dapm_disable_pin() 



The "MicIn" widget is a card level DAPM element so pass the card's DAPM
context instead of the CODEC's DAPM context to snd_soc_dapm_disable_pin().

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3a41e0f7

sound/soc/samsung/smdk_wm8580.c

+1 −4
Original line number Diff line number Diff line
@@ -136,13 +136,10 @@ static const struct snd_soc_dapm_route smdk_wm8580_audio_map[] = { 


static int smdk_wm8580_init_paiftx(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;



	/* Enabling the microphone requires the fitting of a 0R

	 * resistor to connect the line from the microphone jack.

	 */

	snd_soc_dapm_disable_pin(dapm, "MicIn");

	snd_soc_dapm_disable_pin(&rtd->card->dapm, "MicIn");



	return 0;

}