diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-09 10:28:02 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-09 10:46:03 -0400 |
commit | 10a20af7c944649dc6d1ffa06bc759f5f3a16cd9 (patch) | |
tree | 322ad916b8d909e3bdc3c51eb63ccecbdd1ae16a /sound/pci/hda/patch_ca0110.c | |
parent | 86e2959a10828dd2614e037fb2502bc833adca52 (diff) |
ALSA: hda - Improve the input source name labels
This patch improves the input-source label strings to be generated from
the pin information instead of fixed strings per AUTO_PIN_* type.
This gives more suitable labels, especially for mic and line-in pins.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
-rw-r--r-- | sound/pci/hda/patch_ca0110.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index 42b3fb4cafc4..cca11fdd3d79 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c | |||
@@ -474,8 +474,7 @@ static void parse_input(struct hda_codec *codec) | |||
474 | if (j >= cfg->num_inputs) | 474 | if (j >= cfg->num_inputs) |
475 | continue; | 475 | continue; |
476 | spec->input_pins[n] = pin; | 476 | spec->input_pins[n] = pin; |
477 | spec->input_labels[n] = | 477 | spec->input_labels[n] = hda_get_input_pin_label(codec, pin, 1); |
478 | auto_pin_cfg_labels[cfg->inputs[j].type]; | ||
479 | spec->adcs[n] = nid; | 478 | spec->adcs[n] = nid; |
480 | n++; | 479 | n++; |
481 | } | 480 | } |