---

yaml --- r: 111027 b: refs/heads/master c: 79c50e2 h: refs/heads/master i: 111025: 3c0e7dd 111023: b5cca7d v: v3
git-mirror · Sep 22, 2008 · 7521b56 · 7521b56
1 parent c8e3627
commit 7521b56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c871c4a83abaf6caedeff1c502e2c10fd88cbb54
+refs/heads/master: 79c50e23d4272404da7349010f514516976b447a
diff --git a/trunk/sound/pci/oxygen/oxygen_pcm.c b/trunk/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,