1 files changed, 13 insertions, 17 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 693dd14d9ec1..834c5980fe5d 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -5291,7 +5291,6 @@ static int patch_stac92hd83xxx(struct hda_codec *codec)
         hda_nid_t conn[STAC92HD83_DAC_COUNT + 1];
         int err;
         int num_dacs;
-        hda_nid_t nid;
 
         spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -5387,24 +5386,21 @@ again:
                 return err;
         }
 
-        switch (spec->board_config) {
-        case STAC_DELL_S14:
-                nid = 0xf;
-                break;
-        default:
-                nid = 0xe;
-                break;
-        }
-
-        num_dacs = snd_hda_get_connections(codec, nid,
+        /* docking output support */
+        num_dacs = snd_hda_get_connections(codec, 0xF,
                                 conn, STAC92HD83_DAC_COUNT + 1) - 1;
-        if (num_dacs < 0)
-                num_dacs = STAC92HD83_DAC_COUNT;
-
-        /* set port X to select the last DAC
-         */
-        snd_hda_codec_write_cache(codec, nid, 0,
+        /* skip non-DAC connections */
+        while (num_dacs >= 0 &&
+                        (get_wcaps_type(get_wcaps(codec, conn[num_dacs]))
+                                        != AC_WID_AUD_OUT))
+                num_dacs--;
+        /* set port E and F to select the last DAC */
+        if (num_dacs >= 0) {
+                snd_hda_codec_write_cache(codec, 0xE, 0,
+                        AC_VERB_SET_CONNECT_SEL, num_dacs);
+                snd_hda_codec_write_cache(codec, 0xF, 0,
                         AC_VERB_SET_CONNECT_SEL, num_dacs);
+        }
 
         codec->proc_widget_hook = stac92hd_proc_hook;