ALSA: au88x0 - Use a better name for pcm devices of au88x0

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/au88x0/au8810.h b/sound/pci/au88x0/au8810.h
index 5d69c31fe3f474ace0ef2da5c6ab4a117c24036f..79fbee3845ebb4f1b8a471620308c821ac44e9c1 100644 (file)
--- a/sound/pci/au88x0/au8810.h
+++ b/sound/pci/au88x0/au8810.h
@@ -4,7 +4,7 @@
 
 #define CHIP_AU8810
 
-#define CARD_NAME "Aureal Advantage 3D Sound Processor"
+#define CARD_NAME "Aureal Advantage"
 #define CARD_NAME_SHORT "au8810"
 
 #define NR_ADB         0x10

diff --git a/sound/pci/au88x0/au8820.h b/sound/pci/au88x0/au8820.h
index abbe85e4f7a9abb3427b502d2f3c5462ce5b88aa..cafdb9668a341de9c7ec75816b7edd65e06e584d 100644 (file)
--- a/sound/pci/au88x0/au8820.h
+++ b/sound/pci/au88x0/au8820.h
@@ -11,7 +11,7 @@
 
 #define CHIP_AU8820
 
-#define CARD_NAME "Aureal Vortex 3D Sound Processor"
+#define CARD_NAME "Aureal Vortex"
 #define CARD_NAME_SHORT "au8820"
 
 /* Number of ADB and WT channels */

diff --git a/sound/pci/au88x0/au8830.h b/sound/pci/au88x0/au8830.h
index 04ece1b1c2183646bfc008855cc07e3053bc8ecc..999b29ab34ad4d7ad38db5e7e720b0dd201d5a7b 100644 (file)
--- a/sound/pci/au88x0/au8830.h
+++ b/sound/pci/au88x0/au8830.h
@@ -11,7 +11,7 @@
 
 #define CHIP_AU8830
 
-#define CARD_NAME "Aureal Vortex 2 3D Sound Processor"
+#define CARD_NAME "Aureal Vortex 2"
 #define CARD_NAME_SHORT "au8830"
 
 #define NR_ADB 0x20

diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 5439d662d1047377ddd7d832dbd1791e0ce887fe..04b10fdb0d71f19971eed5916e064aa719dd0fea 100644 (file)
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -423,11 +423,11 @@ static struct snd_pcm_ops snd_vortex_playback_ops = {
 */
 
 static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {
-       "AU88x0 ADB",
-       "AU88x0 SPDIF",
-       "AU88x0 A3D",
-       "AU88x0 WT",
-       "AU88x0 I2S",
+       CARD_NAME " ADB",
+       CARD_NAME " SPDIF",
+       CARD_NAME " A3D",
+       CARD_NAME " WT",
+       CARD_NAME " I2S",
 };
 static char *vortex_pcm_name[VORTEX_PCM_LAST] = {
        "adb",
@@ -524,7 +524,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                          nr_capt, &pcm);
        if (err < 0)
                return err;
-       strcpy(pcm->name, vortex_pcm_name[idx]);
+       snprintf(pcm->name, sizeof(pcm->name),
+               "%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);
        chip->pcm[idx] = pcm;
        // This is an evil hack, but it saves a lot of duplicated code.
        VORTEX_PCM_TYPE(pcm) = idx;