diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-16 14:34:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-16 17:59:36 +0100 |
| commit | e236d4d796f87d062f59af8004c8f485baf10b62 (patch) | |
| tree | 3fa89bbabeef3a5d6c2c1a4479980cf79fa1b9fa | |
| parent | ASoC: jive: Automatically disconnect non-connected pins (diff) | |
| download | linux-e236d4d796f87d062f59af8004c8f485baf10b62.tar.xz linux-e236d4d796f87d062f59af8004c8f485baf10b62.zip | |
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>
| -rw-r--r-- | sound/soc/samsung/smdk_wm8580.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c index 17a2f717ec02..548bfd993788 100644 --- a/sound/soc/samsung/smdk_wm8580.c +++ b/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) { - 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; } |