1 files changed, 11 insertions, 1 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 5bc9bd983e86..2f605e593957 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1191,8 +1191,16 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol,
         /* Get Independent Mode index of headphone pin widget */
         spec->hp_independent_mode = spec->hp_independent_mode_index == pinsel
                 ? 1 : 0;
-        snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_CONNECT_SEL, pinsel);
+        if (spec->codec_type == VT1718S)
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel ? 2 : 0);
+        else
+                snd_hda_codec_write(codec, nid, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel);
 
+        if (spec->codec_type == VT1812)
+                snd_hda_codec_write(codec, 0x35, 0,
+                                    AC_VERB_SET_CONNECT_SEL, pinsel);
         if (spec->multiout.hp_nid && spec->multiout.hp_nid
             != spec->multiout.dac_nids[HDA_FRONT])
                 snd_hda_codec_setup_stream(codec, spec->multiout.hp_nid,
@@ -1211,6 +1219,8 @@ static int via_independent_hp_put(struct snd_kcontrol *kcontrol,
                 activate_ctl(codec, "Headphone Playback Switch",
                              spec->hp_independent_mode);
         }
+        /* update jack power state */
+        set_jack_power_state(codec);
         return 0;
 }