From 501ac7e64d8ea4e4686a591e0c7578654433c4c5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 21 Jan 2013 16:50:09 +0100 Subject: [PATCH] --- yaml --- r: 353197 b: refs/heads/master c: a607148ff3b9f40427c0f0d5fa039a3a758735c7 h: refs/heads/master i: 353195: 251084a323a9a7ce7fbd593f11850130163aa186 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 5 ++++- trunk/sound/pci/hda/hda_generic.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 082ccf6dd28a..d11fd5add1e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2f8be43c5c92355feea2ec332375ece00bc0ff9 +refs/heads/master: a607148ff3b9f40427c0f0d5fa039a3a758735c7 diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 6d1e843c6e8d..63d12efb7c1a 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -4531,9 +4531,12 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) !spec->dyn_adc_switch && !spec->auto_mic; /* Additional Analaog capture for index #2 */ if (spec->alt_dac_nid || have_multi_adcs) { + fill_pcm_stream_name(spec->stream_name_alt_analog, + sizeof(spec->stream_name_alt_analog), + " Alt Analog", codec->chip_name); codec->num_pcms = 3; info = spec->pcm_rec + 2; - info->name = spec->stream_name_analog; + info->name = spec->stream_name_alt_analog; if (spec->alt_dac_nid) { p = spec->stream_analog_alt_playback; if (!p) diff --git a/trunk/sound/pci/hda/hda_generic.h b/trunk/sound/pci/hda/hda_generic.h index 9c63555b971c..980707fcd30a 100644 --- a/trunk/sound/pci/hda/hda_generic.h +++ b/trunk/sound/pci/hda/hda_generic.h @@ -80,6 +80,8 @@ struct hda_gen_spec { char stream_name_analog[32]; /* analog PCM stream */ const struct hda_pcm_stream *stream_analog_playback; const struct hda_pcm_stream *stream_analog_capture; + + char stream_name_alt_analog[32]; /* alternative analog PCM stream */ const struct hda_pcm_stream *stream_analog_alt_playback; const struct hda_pcm_stream *stream_analog_alt_capture;