Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79c50e23 authored by Clemens Ladisch's avatar Clemens Ladisch
Browse files

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: default avatarClemens Ladisch <clemens@ladisch.de>
parent c871c4a8

sound/pci/oxygen/oxygen_pcm.c

+3 −2
Original line number Diff line number Diff line
@@ -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,