summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConnor McAdams <conmanx360@gmail.com>2018-08-08 13:34:14 -0400
committerTakashi Iwai <tiwai@suse.de>2018-08-08 20:37:50 +0200
commita1b7f016a1ae5e51f0e11a70cf1a5875d3ccee73 (patch)
treef8503346f05ba6b05e023db40a00b90bcbdb7464
parentd97420d2b0379e498adc3fae5db8fa70945b5d56 (diff)
downloadlinux-stable-a1b7f016a1ae5e51f0e11a70cf1a5875d3ccee73.tar.gz
linux-stable-a1b7f016a1ae5e51f0e11a70cf1a5875d3ccee73.tar.bz2
linux-stable-a1b7f016a1ae5e51f0e11a70cf1a5875d3ccee73.zip
ALSA: hda/ca0132 - Add alt_functions unsolicited response
This patch fixes a previous oversight where the microphone unsolicited response would use the wrong input selection function. Signed-off-by: Connor McAdams <conmanx360@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_ca0132.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 8b98d18d97ac..3e43d5686207 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -6744,7 +6744,12 @@ static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
static void amic_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
{
- ca0132_select_mic(codec);
+ struct ca0132_spec *spec = codec->spec;
+
+ if (spec->use_alt_functions)
+ ca0132_alt_select_in(codec);
+ else
+ ca0132_select_mic(codec);
}
static void ca0132_init_unsol(struct hda_codec *codec)