diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-16 18:33:26 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-16 18:48:23 +0400 |
| commit | 201e06ffa9ef9b5265e636617f4fa20cd1490343 (patch) | |
| tree | 426dc4d85dde40d2a834d34a374bee9c2f2ad53a /sound/pci/hda/patch_ca0110.c | |
| parent | bf815bf0a3c3b8ad6cd97cda6bc29cc3708fe749 (diff) | |
| download | linux-201e06ffa9ef9b5265e636617f4fa20cd1490343.tar.xz | |
ALSA: hda - Give more unique names by snd_hda_get_pin_label()
The function now gives more unique names for the output pins by adding
some prefix and suffix for the location and the channels. Otherwise, it
can pass the index number.
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 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index 6bd602bfe0fe..09ccfabb4a17 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c @@ -41,7 +41,7 @@ struct ca0110_spec { hda_nid_t dig_out; hda_nid_t dig_in; unsigned int num_inputs; - const char *input_labels[AUTO_PIN_LAST]; + char input_labels[AUTO_PIN_LAST][32]; struct hda_pcm pcm_rec[2]; /* PCM information */ }; @@ -476,7 +476,9 @@ static void parse_input(struct hda_codec *codec) if (j >= cfg->num_inputs) continue; spec->input_pins[n] = pin; - spec->input_labels[n] = snd_hda_get_pin_label(codec, pin, NULL); + snd_hda_get_pin_label(codec, pin, cfg, + spec->input_labels[n], + sizeof(spec->input_labels[n]), NULL); spec->adcs[n] = nid; n++; } |