renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 09:13:55 +08:00
Code

ALSA: oxygen: rename first PCM device

Browse Source 
Rename the first PCM device from "Analog" to "Multichannel" because it
can be used for HDMI output on the Xonar HDAV.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
Clemens Ladisch 2008-09-22 09:07:53 +02:00
parent c871c4a83a
commit 79c50e23d4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/oxygen/oxygen_pcm.c
View File

@ -661,7 +661,8 @@ int oxygen_pcm_init(struct oxygen *chip)
ins = !!(chip->model.device_config & (CAPTURE_0_FROM_I2S_1 | ins = !!(chip->model.device_config & (CAPTURE_0_FROM_I2S_1 |
CAPTURE_0_FROM_I2S_2)); CAPTURE_0_FROM_I2S_2));
if (outs | ins) { if (outs | ins) {
err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm); err = snd_pcm_new(chip->card, "Multichannel",
0, outs, ins, &pcm);
if (err < 0) if (err < 0)
return err; return err;
if (outs) if (outs)
@ -675,7 +676,7 @@ int oxygen_pcm_init(struct oxygen *chip)
&oxygen_rec_b_ops); &oxygen_rec_b_ops);
pcm->private_data = chip; pcm->private_data = chip;
pcm->private_free = oxygen_pcm_free; pcm->private_free = oxygen_pcm_free;
strcpy(pcm->name, "Analog"); strcpy(pcm->name, "Multichannel");
if (outs) if (outs)
snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream, snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
SNDRV_DMA_TYPE_DEV, SNDRV_DMA_TYPE_DEV,