aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_sigmatel.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r--sound/pci/hda/patch_sigmatel.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 8311c9fa0527..61903848cd43 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -702,9 +702,6 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, struct auto_pin
702static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg) 702static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
703{ 703{
704 struct sigmatel_spec *spec = codec->spec; 704 struct sigmatel_spec *spec = codec->spec;
705 static char *labels[AUTO_PIN_LAST] = {
706 "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux"
707 };
708 struct hda_input_mux *imux = &spec->private_imux; 705 struct hda_input_mux *imux = &spec->private_imux;
709 hda_nid_t con_lst[HDA_MAX_NUM_INPUTS]; 706 hda_nid_t con_lst[HDA_MAX_NUM_INPUTS];
710 int i, j, k; 707 int i, j, k;
@@ -715,7 +712,7 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const
715 /* Enable active pin widget as an input */ 712 /* Enable active pin widget as an input */
716 stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], AC_PINCTL_IN_EN); 713 stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], AC_PINCTL_IN_EN);
717 714
718 imux->items[imux->num_items].label = labels[i]; 715 imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
719 716
720 for (j=0; j<spec->num_muxes; j++) { 717 for (j=0; j<spec->num_muxes; j++) {
721 int num_cons = snd_hda_get_connections(codec, spec->mux_nids[j], con_lst, HDA_MAX_NUM_INPUTS); 718 int num_cons = snd_hda_get_connections(codec, spec->mux_nids[j], con_lst, HDA_MAX_NUM_INPUTS);