From babce5f7346f1a43d5f01789607ff65c26b71766 Mon Sep 17 00:00:00 2001
From: Raymond Yau <superquad.vortex2@gmail.com>
Date: Tue, 26 Apr 2011 12:15:23 +0800
Subject: [PATCH] --- yaml --- r: 248163 b: refs/heads/master c:
 13eb4ab8ca719c852ae5fbd6e803afa333ad569a h: refs/heads/master i:   248161:
 109a701246a0c8779696ab3e7e754120ca9bce64   248159:
 6142dff048854db5ec4a7144b12bb74adf70b6ab v: v3

---
 [refs]                              |  2 +-
 trunk/sound/pci/au88x0/au8810.h     |  2 +-
 trunk/sound/pci/au88x0/au8820.h     |  2 +-
 trunk/sound/pci/au88x0/au8830.h     |  2 +-
 trunk/sound/pci/au88x0/au88x0_pcm.c | 13 +++++++------
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5cc591094629..d8fd0856bb98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae9572b5b08f1d2a2ea6613f59d00f741b38b2d
+refs/heads/master: 13eb4ab8ca719c852ae5fbd6e803afa333ad569a
diff --git a/trunk/sound/pci/au88x0/au8810.h b/trunk/sound/pci/au88x0/au8810.h
index 5d69c31fe3f4..79fbee3845eb 100644
--- a/trunk/sound/pci/au88x0/au8810.h
+++ b/trunk/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/trunk/sound/pci/au88x0/au8820.h b/trunk/sound/pci/au88x0/au8820.h
index abbe85e4f7a9..cafdb9668a34 100644
--- a/trunk/sound/pci/au88x0/au8820.h
+++ b/trunk/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/trunk/sound/pci/au88x0/au8830.h b/trunk/sound/pci/au88x0/au8830.h
index 04ece1b1c218..999b29ab34ad 100644
--- a/trunk/sound/pci/au88x0/au8830.h
+++ b/trunk/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/trunk/sound/pci/au88x0/au88x0_pcm.c b/trunk/sound/pci/au88x0/au88x0_pcm.c
index 5439d662d104..04b10fdb0d71 100644
--- a/trunk/sound/pci/au88x0/au88x0_pcm.c
+++ b/trunk/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;