From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 22 Sep 2008 07:07:53 +0000 (+0200)
Subject: ALSA: oxygen: rename first PCM device
X-Git-Tag: v2.6.28-rc1~720^2~62
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=79c50e23d4272404da7349010f514516976b447a;p=~shefty%2Frdma-dev.git

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>
---

diff --git a/sound/pci/oxygen/oxygen_pcm.c b/sound/pci/oxygen/oxygen_pcm.c
index 87b60071b61..c262049961e 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)
 	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,