summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-26 08:44:26 +0100
committerTakashi Iwai <tiwai@suse.de>2013-11-27 14:55:45 +0100
commit16c0cefe8951b2c4b824fd06011ac1b359b1ab3b (patch)
tree64b3759c9e7e13d76985efa50aaaed3651bd77c9 /sound
parentced4cefc75fdb8be95eaee325ad0f6b2fc0a484b (diff)
downloadlinux-16c0cefe8951b2c4b824fd06011ac1b359b1ab3b.tar.gz
linux-16c0cefe8951b2c4b824fd06011ac1b359b1ab3b.tar.bz2
linux-16c0cefe8951b2c4b824fd06011ac1b359b1ab3b.zip
ALSA: hda - Fix hp-mic mode without VREF bits
When the hp mic pin has no VREF bits, the driver forgot to set PIN_IN bit. Spotted during debugging old MacBook Airs. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65681 Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 3bd89ab0d9af..faefff1d3e81 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2760,7 +2760,7 @@ static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol,
val &= ~(AC_PINCTL_VREFEN | PIN_HP);
val |= get_vref_idx(vref_caps, idx) | PIN_IN;
} else
- val = snd_hda_get_default_vref(codec, nid);
+ val = snd_hda_get_default_vref(codec, nid) | PIN_IN;
}
snd_hda_set_pin_ctl_cache(codec, nid, val);
call_hp_automute(codec, NULL);