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

Commit 5efbc261 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: Fix leftover chmap UNKNOWN -> MONO conversions 



A few files have been slipped from the previous commit to add MONO
channel type.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7b31d009

sound/core/pcm_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -2311,7 +2311,7 @@ EXPORT_SYMBOL(snd_pcm_lib_readv); 
/* default channel maps for multi-channel playbacks, up to 8 channels */

const struct snd_pcm_chmap_elem snd_pcm_std_chmaps[] = {

	{ .channels = 1,

	  .map = { SNDRV_CHMAP_UNKNOWN } },

	  .map = { SNDRV_CHMAP_MONO } },

	{ .channels = 2,

	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },

	{ .channels = 4,
@@ -2333,7 +2333,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_std_chmaps); 
/* alternative channel maps with CLFE <-> surround swapped for 6/8 channels */

const struct snd_pcm_chmap_elem snd_pcm_alt_chmaps[] = {

	{ .channels = 1,

	  .map = { SNDRV_CHMAP_UNKNOWN } },

	  .map = { SNDRV_CHMAP_MONO } },

	{ .channels = 2,

	  .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },

	{ .channels = 4,

sound/pci/ens1370.c

+1 −1
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ static struct snd_pcm_ops snd_ensoniq_capture_ops = { 


static const struct snd_pcm_chmap_elem surround_map[] = {

	{ .channels = 1,

	  .map = { SNDRV_CHMAP_UNKNOWN } },

	  .map = { SNDRV_CHMAP_MONO } },

	{ .channels = 2,

	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },

	{ }

sound/pci/ymfpci/ymfpci_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static struct snd_pcm_ops snd_ymfpci_playback_4ch_ops = { 


static const struct snd_pcm_chmap_elem surround_map[] = {

	{ .channels = 1,

	  .map = { SNDRV_CHMAP_UNKNOWN } },

	  .map = { SNDRV_CHMAP_MONO } },

	{ .channels = 2,

	  .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },

	{ }