diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-12-07 13:56:29 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:30:40 +0100 |
| commit | 4a471b7ddfe76e39c1633d5a23a687f4b5fc0d8d (patch) | |
| tree | 7ec3b5952d03751e5d5da2d6254f8ce63ba2ba05 /sound/pci/hda/patch_analog.c | |
| parent | f7a9275d949cb0bf1f259a1546e52a0bf518151c (diff) | |
| download | op-kernel-dev-4a471b7ddfe76e39c1633d5a23a687f4b5fc0d8d.zip op-kernel-dev-4a471b7ddfe76e39c1633d5a23a687f4b5fc0d8d.tar.gz | |
[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_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index d1e1ded..1ada1b0 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1850,18 +1850,16 @@ static int new_analog_input(struct ad198x_spec *spec, hda_nid_t pin, static int ad1988_auto_create_analog_input_ctls(struct ad198x_spec *spec, const struct auto_pin_cfg *cfg) { - static char *labels[AUTO_PIN_LAST] = { - "Mic", "Front Mic", "Line", "Front Line", "CD", "Aux" - }; struct hda_input_mux *imux = &spec->private_imux; int i, err; for (i = 0; i < AUTO_PIN_LAST; i++) { - err = new_analog_input(spec, cfg->input_pins[i], labels[i], + err = new_analog_input(spec, cfg->input_pins[i], + auto_pin_cfg_labels[i], i <= AUTO_PIN_FRONT_MIC); if (err < 0) return err; - imux->items[imux->num_items].label = labels[i]; + imux->items[imux->num_items].label = auto_pin_cfg_labels[i]; imux->items[imux->num_items].index = ad1988_pin_to_adc_idx(cfg->input_pins[i]); imux->num_items++; } |
