diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-12-07 12:56:29 (GMT) |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 11:30:40 (GMT) |
| commit | 4a471b7ddfe76e39c1633d5a23a687f4b5fc0d8d (patch) | |
| tree | 7ec3b5952d03751e5d5da2d6254f8ce63ba2ba05 /sound/pci/hda/patch_sigmatel.c | |
| parent | f7a9275d949cb0bf1f259a1546e52a0bf518151c (diff) | |
| download | linux-fsl-qoriq-4a471b7ddfe76e39c1633d5a23a687f4b5fc0d8d.tar.xz | |
[ALSA] hda-codec - Small clean up and fixes
Modules: HDA Codec driver,HDA generic driver
- Common labels for input pins
- Fix and clean up of Realtek codec parsers
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8311c9f..6190384 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 static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const struct auto_pin_cfg *cfg) { struct sigmatel_spec *spec = codec->spec; - static char *labels[AUTO_PIN_LAST] = { - "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux" - }; struct hda_input_mux *imux = &spec->private_imux; hda_nid_t con_lst[HDA_MAX_NUM_INPUTS]; int i, j, k; @@ -715,7 +712,7 @@ static int stac92xx_auto_create_analog_input_ctls(struct hda_codec *codec, const /* Enable active pin widget as an input */ stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], AC_PINCTL_IN_EN); - imux->items[imux->num_items].label = labels[i]; + imux->items[imux->num_items].label = auto_pin_cfg_labels[i]; for (j=0; j<spec->num_muxes; j++) { int num_cons = snd_hda_get_connections(codec, spec->mux_nids[j], con_lst, HDA_MAX_NUM_INPUTS); |