aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/au88x0/au88x0_pcm.c
diff options
context:
space:
mode:
authorRaymond Yau <superquad.vortex2@gmail.com>2011-04-26 12:15:23 +0800
committerTakashi Iwai <tiwai@suse.de>2011-04-26 12:27:21 +0200
commit13eb4ab8ca719c852ae5fbd6e803afa333ad569a (patch)
treeaf8d11abee35d4db3df80290327ad1bf03293489 /sound/pci/au88x0/au88x0_pcm.c
parentALSA: 6fire: use the kernel's built-in bit reverse table (diff)
downloadlinux-dev-13eb4ab8ca719c852ae5fbd6e803afa333ad569a.tar.xz
linux-dev-13eb4ab8ca719c852ae5fbd6e803afa333ad569a.zip
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>
Diffstat (limited to 'sound/pci/au88x0/au88x0_pcm.c')
-rw-r--r--sound/pci/au88x0/au88x0_pcm.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 5439d662d104..04b10fdb0d71 100644
--- 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;