diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-06-20 09:30:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-06-20 09:30:42 +0200 |
| commit | ccfcf7d151c01969133b5555eed635537c41c944 (patch) | |
| tree | 977f13016b93e6016c755c9805975ef4058d8781 /sound/pci | |
| parent | 21cd683d318041c63876b4acbebb3f6d9d80597b (diff) | |
| download | linux-3.10-ccfcf7d151c01969133b5555eed635537c41c944.tar.gz linux-3.10-ccfcf7d151c01969133b5555eed635537c41c944.tar.bz2 linux-3.10-ccfcf7d151c01969133b5555eed635537c41c944.zip | |
ALSA: hda - Add missing snd_hda_jack_detect_enable() for simple_hdmi*()
Reported-by: Annie Liu <annieliu@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/hda/patch_hdmi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 72a3b26736a..db8f6928f83 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1415,13 +1415,15 @@ static int simple_playback_init(struct hda_codec *codec) int i; for (i = 0; i < spec->num_pins; i++) { - snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0, + hda_nid_t pin = spec->pins[i].pin_nid; + snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); /* some codecs require to unmute the pin */ - if (get_wcaps(codec, spec->pins[i].pin_nid) & AC_WCAP_OUT_AMP) - snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0, + if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP) + snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + snd_hda_jack_detect_enable(codec, pin, pin); } snd_hda_jack_report_sync(codec); return 0; |