]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ALSA: oxygen: rename first PCM device
authorClemens Ladisch <clemens@ladisch.de>
Mon, 22 Sep 2008 07:07:53 +0000 (09:07 +0200)
committerClemens Ladisch <clemens@ladisch.de>
Mon, 22 Sep 2008 07:07:53 +0000 (09:07 +0200)
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>
sound/pci/oxygen/oxygen_pcm.c

index 87b60071b6164c068f1d06be2d578b114b49f382..c262049961e15a0dd9840645f753584373dac52a 100644 (file)
@@ -661,7 +661,8 @@ int oxygen_pcm_init(struct oxygen *chip)
        ins = !!(chip->model.device_config & (CAPTURE_0_FROM_I2S_1 |
                                              CAPTURE_0_FROM_I2S_2));
        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)
                        return err;
                if (outs)
@@ -675,7 +676,7 @@ int oxygen_pcm_init(struct oxygen *chip)
                                        &oxygen_rec_b_ops);
                pcm->private_data = chip;
                pcm->private_free = oxygen_pcm_free;
-               strcpy(pcm->name, "Analog");
+               strcpy(pcm->name, "Multichannel");
                if (outs)
                        snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream,
                                                      SNDRV_DMA_TYPE_DEV,