From: Jarkko Nikula Date: Mon, 23 Jun 2014 13:29:41 +0000 (+0300) Subject: ASoC: Intel: byt-max98090: Do not change speaker and DMIC with jack state X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b29d7c5f7126d3c0b9984fcfd74ea82ec4fb3510;p=linux-beck.git ASoC: Intel: byt-max98090: Do not change speaker and DMIC with jack state Kernel should not enable/disable speakers and digital microphone whenever jack is inserted/removed. This is more use-case than kernel specific decision. For instance one may want to play VoIP ring tones using both speakers and headphone but play music only from one of them. Because of above reason remove "Ext Spk" and "Int Mic" update when jack state is changed. Also this update was illogical anyway: "Ext Spk" was enabled when jack was inserted and disabled when jack was removed. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown --- diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c index 5fc98c64a3f4..da0b2ee28dff 100644 --- a/sound/soc/intel/byt-max98090.c +++ b/sound/soc/intel/byt-max98090.c @@ -64,14 +64,6 @@ static struct snd_soc_jack_pin hs_jack_pins[] = { .pin = "Headset Mic", .mask = SND_JACK_MICROPHONE, }, - { - .pin = "Ext Spk", - .mask = SND_JACK_LINEOUT, - }, - { - .pin = "Int Mic", - .mask = SND_JACK_LINEIN, - }, }; static struct snd_soc_jack_gpio hs_jack_gpios[] = {