ALSA: hda - Set individual name to secondary analog PCM stream

It'd be better to give another name to the secondary (alt) analog PCM
stream, which is dedicated for the independent HP out and extra
inputs.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 6d1e843..63d12ef 100644 (file)
--- a/sound/pci/hda/hda_generic.c
+++ b/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/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h
index 9c63555..980707f 100644 (file)
--- a/sound/pci/hda/hda_generic.h
+++ b/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;