1 files changed, 10 insertions, 9 deletions

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 431c0d417ee..3467d0c23fe 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -54,6 +54,7 @@
 #include <sound/asoundef.h>
 #include "hda_codec.h"
 #include "hda_local.h"
+#include "hda_jack.h"
 
 /* Pin Widget NID */
 #define VT1708_HP_PIN_NID       0x20
@@ -1708,6 +1709,8 @@ static void via_gpio_control(struct hda_codec *codec)
 static void via_unsol_event(struct hda_codec *codec,
                                   unsigned int res)
 {
+        snd_hda_jack_set_dirty_all(codec); /* FIXME: to be more fine-grained */
+
         res >>= 26;
 
         if (res & VIA_JACK_EVENT)
@@ -2729,9 +2732,8 @@ static void via_auto_init_unsol_event(struct hda_codec *codec)
         int i;
 
         if (cfg->hp_pins[0] && is_jack_detectable(codec, cfg->hp_pins[0]))
-                snd_hda_codec_write(codec, cfg->hp_pins[0], 0,
-                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                AC_USRSP_EN | VIA_HP_EVENT | VIA_JACK_EVENT);
+                snd_hda_jack_detect_enable(codec, cfg->hp_pins[0],
+                                           VIA_HP_EVENT | VIA_JACK_EVENT);
 
         if (cfg->speaker_pins[0])
                 ev = VIA_LINE_EVENT;
@@ -2740,16 +2742,14 @@ static void via_auto_init_unsol_event(struct hda_codec *codec)
         for (i = 0; i < cfg->line_outs; i++) {
                 if (cfg->line_out_pins[i] &&
                     is_jack_detectable(codec, cfg->line_out_pins[i]))
-                        snd_hda_codec_write(codec, cfg->line_out_pins[i], 0,
-                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                AC_USRSP_EN | ev | VIA_JACK_EVENT);
+                        snd_hda_jack_detect_enable(codec, cfg->line_out_pins[i],
+                                                   ev | VIA_JACK_EVENT);
         }
 
         for (i = 0; i < cfg->num_inputs; i++) {
                 if (is_jack_detectable(codec, cfg->inputs[i].pin))
-                        snd_hda_codec_write(codec, cfg->inputs[i].pin, 0,
-                                AC_VERB_SET_UNSOLICITED_ENABLE,
-                                AC_USRSP_EN | VIA_JACK_EVENT);
+                        snd_hda_jack_detect_enable(codec, cfg->inputs[i].pin,
+                                                   VIA_JACK_EVENT);
         }
 }
 
@@ -2781,6 +2781,7 @@ static void vt1708_update_hp_jack_state(struct work_struct *work)
                                              vt1708_hp_work.work);
         if (spec->codec_type != VT1708)
                 return;
+        snd_hda_jack_set_dirty_all(spec->codec);
         /* if jack state toggled */
         if (spec->vt1708_hp_present
             != snd_hda_jack_detect(spec->codec, spec->autocfg.hp_pins[0])) {