diff options
author | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:07:53 -0400 |
---|---|---|
committer | Clemens Ladisch <clemens@ladisch.de> | 2008-09-22 03:07:53 -0400 |
commit | 79c50e23d4272404da7349010f514516976b447a (patch) | |
tree | d7e8fa3819d32468cfa76f75f96e67964e3ae7b3 /sound | |
parent | c871c4a83abaf6caedeff1c502e2c10fd88cbb54 (diff) |
ALSA: oxygen: rename first PCM device
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/oxygen/oxygen_pcm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c index 87b60071b616..c262049961e1 100644 --- a/sound/pci/oxygen/oxygen_pcm.c +++ b/sound/pci/oxygen/oxygen_pcm.c | |||
@@ -661,7 +661,8 @@ int oxygen_pcm_init(struct oxygen *chip) | |||
661 | ins = !!(chip->model.device_config & (CAPTURE_0_FROM_I2S_1 | | 661 | ins = !!(chip->model.device_config & (CAPTURE_0_FROM_I2S_1 | |
662 | CAPTURE_0_FROM_I2S_2)); | 662 | CAPTURE_0_FROM_I2S_2)); |
663 | if (outs | ins) { | 663 | if (outs | ins) { |
664 | err = snd_pcm_new(chip->card, "Analog", 0, outs, ins, &pcm); | 664 | err = snd_pcm_new(chip->card, "Multichannel", |
665 | 0, outs, ins, &pcm); | ||
665 | if (err < 0) | 666 | if (err < 0) |
666 | return err; | 667 | return err; |
667 | if (outs) | 668 | if (outs) |
@@ -675,7 +676,7 @@ int oxygen_pcm_init(struct oxygen *chip) | |||
675 | &oxygen_rec_b_ops); | 676 | &oxygen_rec_b_ops); |
676 | pcm->private_data = chip; | 677 | pcm->private_data = chip; |
677 | pcm->private_free = oxygen_pcm_free; | 678 | pcm->private_free = oxygen_pcm_free; |
678 | strcpy(pcm->name, "Analog"); | 679 | strcpy(pcm->name, "Multichannel"); |
679 | if (outs) | 680 | if (outs) |
680 | snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream, | 681 | snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream, |
681 | SNDRV_DMA_TYPE_DEV, | 682 | SNDRV_DMA_TYPE_DEV, |