[ALSA] hda: Mic as output fix

Added logic to check if AUTO_PIN_FRONT_MIC is available for output
switch, if AUTO_PIN_MIC isn't.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 314ea51538b77ebb5684d57bd3e7b1f83acd3a66..ef86402d7e67bfc0c650041a3fad776c154695fe 100644 (file)
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2307,6 +2307,29 @@ static int create_controls(struct sigmatel_spec *spec, const char *pfx, hda_nid_
        return 0;
 }
 
+static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
+{
+       if (!spec->multiout.hp_nid)
+               spec->multiout.hp_nid = nid;
+       else if (spec->multiout.num_dacs > 4) {
+               printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
+               return 1;
+       } else {
+               spec->multiout.dac_nids[spec->multiout.num_dacs] = nid;
+               spec->multiout.num_dacs++;
+       }
+       return 0;
+}
+
+static int check_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
+{
+       if (is_in_dac_nids(spec, nid))
+               return 1;
+       if (spec->multiout.hp_nid == nid)
+               return 1;
+       return 0;
+}
+
 /* add playback controls from the parsed DAC table */
 static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
                                               const struct auto_pin_cfg *cfg)
@@ -2369,10 +2392,11 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
 
        if (spec->mic_switch) {
                unsigned int def_conf;
-               nid = cfg->input_pins[AUTO_PIN_MIC];
+               unsigned int mic_pin = AUTO_PIN_MIC;
+again:
+               nid = cfg->input_pins[mic_pin];
                def_conf = snd_hda_codec_read(codec, nid, 0,
                                                AC_VERB_GET_CONFIG_DEFAULT, 0);
-
                /* some laptops have an internal analog microphone
                 * which can't be used as a output */
                if (get_defcfg_connect(def_conf) != AC_JACK_PORT_FIXED) {
@@ -2382,38 +2406,22 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
                                err = stac92xx_add_control(spec,
                                        STAC_CTL_WIDGET_IO_SWITCH,
                                        "Mic as Output Switch", (nid << 8) | 1);
+                               nid = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
+                               if (!check_in_dac_nids(spec, nid))
+                                       add_spec_dacs(spec, nid);
                                if (err < 0)
                                        return err;
                        }
+               } else if (mic_pin == AUTO_PIN_MIC) {
+                       mic_pin = AUTO_PIN_FRONT_MIC;
+                       goto again;
                }
        }
 
        return 0;
 }
 
-static int check_in_dac_nids(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-       if (is_in_dac_nids(spec, nid))
-               return 1;
-       if (spec->multiout.hp_nid == nid)
-               return 1;
-       return 0;
-}
-
-static int add_spec_dacs(struct sigmatel_spec *spec, hda_nid_t nid)
-{
-       if (!spec->multiout.hp_nid)
-               spec->multiout.hp_nid = nid;
-       else if (spec->multiout.num_dacs > 4) {
-               printk(KERN_WARNING "stac92xx: No space for DAC 0x%x\n", nid);
-               return 1;
-       } else {
-               spec->multiout.dac_nids[spec->multiout.num_dacs] = nid;
-               spec->multiout.num_dacs++;
-       }
-       return 0;
-}
-
 /* add playback controls for Speaker and HP outputs */
 static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec,
                                        struct auto_pin_cfg *cfg)