]> Pileus Git - ~andy/linux/commitdiff
ALSA: hda - Add missing snd_hda_jack_detect_enable() for simple_hdmi*()
authorTakashi Iwai <tiwai@suse.de>
Wed, 20 Jun 2012 07:30:42 +0000 (09:30 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 20 Jun 2012 07:30:42 +0000 (09:30 +0200)
Reported-by: Annie Liu <annieliu@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_hdmi.c

index 72a3b26736aee6842b6e99525624eb1060c3ac53..db8f6928f83997ab3d1b755502eb20484953dfe1 100644 (file)
@@ -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;