aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-26 02:44:26 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-04 13:57:17 -0500
commit5fb0e7deb22f290a47686898a01fb39a581f9970 (patch)
tree426ebaa91d1737008a3401826cf856338a8fc9e0 /sound
parenteda7913868a57fe6047459290b59d66007f99053 (diff)
ALSA: hda - Fix hp-mic mode without VREF bits
commit 16c0cefe8951b2c4b824fd06011ac1b359b1ab3b upstream. 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 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 26ed56f00b7c..fd856cc6ed63 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2703,7 +2703,7 @@ static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol,
2703 val &= ~(AC_PINCTL_VREFEN | PIN_HP); 2703 val &= ~(AC_PINCTL_VREFEN | PIN_HP);
2704 val |= get_vref_idx(vref_caps, idx) | PIN_IN; 2704 val |= get_vref_idx(vref_caps, idx) | PIN_IN;
2705 } else 2705 } else
2706 val = snd_hda_get_default_vref(codec, nid); 2706 val = snd_hda_get_default_vref(codec, nid) | PIN_IN;
2707 } 2707 }
2708 snd_hda_set_pin_ctl_cache(codec, nid, val); 2708 snd_hda_set_pin_ctl_cache(codec, nid, val);
2709 call_hp_automute(codec, NULL); 2709 call_hp_automute(codec, NULL);