aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-17 10:26:37 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-17 10:28:20 +0200
commit41c89ef3aafea5f35601fa75edba90e7417f604e (patch)
tree77d93174e8411c8f0faf76d4985d4cecbbc54c64 /sound
parent9907790aa06bfc04bf78b445e732ea10039c61e4 (diff)
downloadmrst-s0i3-test-41c89ef3aafea5f35601fa75edba90e7417f604e.tar.gz
mrst-s0i3-test-41c89ef3aafea5f35601fa75edba90e7417f604e.tar.xz
mrst-s0i3-test-41c89ef3aafea5f35601fa75edba90e7417f604e.zip
ALSA: hda - Fix mic attribute check for internal mics
Now Windows claims that the BIOS sets pins for internal mics to be BOTH connection instead of FIXED. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_codec.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 08d81b87302..9f668efbe42 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4648,8 +4648,11 @@ enum {
static int get_mic_pin_attr(unsigned int def_conf)
{
unsigned int loc = get_defcfg_location(def_conf);
- if (get_defcfg_connect(def_conf) == AC_JACK_PORT_FIXED ||
- (loc & 0x30) == AC_JACK_LOC_INTERNAL)
+ unsigned int conn = get_defcfg_connect(def_conf);
+ /* Windows may claim the internal mic to be BOTH, too */
+ if (conn == AC_JACK_PORT_FIXED || conn == AC_JACK_PORT_BOTH)
+ return MIC_ATTR_INT;
+ if ((loc & 0x30) == AC_JACK_LOC_INTERNAL)
return MIC_ATTR_INT;
if ((loc & 0x30) == AC_JACK_LOC_SEPARATE)
return MIC_ATTR_DOCK;