| Message ID | 1420835301-14469-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3c066c642aba407819cf83413025705c6e2a68f9 |
| Headers | show |
On Fri, Jan 09, 2015 at 09:28:21PM +0100, Lars-Peter Clausen wrote: > 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. Applied, thanks.
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index e3d7257a..5001dbb 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
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> --- sound/soc/pxa/ttc-dkb.c | 4 ---- 1 file changed, 4 deletions(-)