diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-01-09 21:28:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-09 20:30:58 +0000 |
| commit | 3c066c642aba407819cf83413025705c6e2a68f9 (patch) | |
| tree | d9797a35840ae9c14a9f8879847d924e398be86e /sound/soc/pxa/ttc-dkb.c | |
| parent | 7e0fc116c41f0ca93c4d3de6d26c223c92182857 (diff) | |
| download | linux-stable-3c066c642aba407819cf83413025705c6e2a68f9.tar.gz linux-stable-3c066c642aba407819cf83413025705c6e2a68f9.tar.bz2 linux-stable-3c066c642aba407819cf83413025705c6e2a68f9.zip | |
ASoC: ttc-dkb: Remove unnecessary snd_soc_dapm_disable_pin() calls
The "Headset Mic 2" and the "Headset Stereophone" widget are managed by the
jack detection logic. Their will be set depending on whether something is
connected to the jack or not. There is no need to manually change the state
beforehand as it will be overwritten anyway.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/pxa/ttc-dkb.c')
| -rw-r--r-- | sound/soc/pxa/ttc-dkb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index e3d7257ad09c..5001dbb9b257 100644 --- a/sound/soc/pxa/ttc-dkb.c +++ b/sound/soc/pxa/ttc-dkb.c @@ -76,10 +76,6 @@ static const struct snd_soc_dapm_route ttc_audio_map[] = { static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_disable_pin(dapm, "Headset Mic 2"); - snd_soc_dapm_disable_pin(dapm, "Headset Stereophone"); /* Headset jack detection */ snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE |