Skip to content

Commit

Permalink
ALSA: au88x0 - Use a better name for pcm devices of au88x0
Browse files Browse the repository at this point in the history
Signed-off-by: Raymond Yau <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Raymond Yau authored and tiwai committed Apr 26, 2011
1 parent 8ae9572 commit 13eb4ab
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion sound/pci/au88x0/au8810.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/au88x0/au8820.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/au88x0/au8830.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions sound/pci/au88x0/au88x0_pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 13eb4ab

Please sign in to comment.