瀏覽代碼

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: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Lars-Peter Clausen 10 年之前
父節點
當前提交
e236d4d796
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      sound/soc/samsung/smdk_wm8580.c

+ 1 - 4
sound/soc/samsung/smdk_wm8580.c

@@ -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)
 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
 	/* Enabling the microphone requires the fitting of a 0R
 	 * resistor to connect the line from the microphone jack.
 	 * 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;
 	return 0;
 }
 }