aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-09-13 08:48:46 -0400
committerTakashi Iwai <tiwai@suse.de>2012-09-13 08:48:46 -0400
commit5efbc2610a7b2aac6c51f8fc943c019106568939 (patch)
tree93112efdb376d895d17f2dd54df212ddb186eba0 /sound
parent7b31d0095e87221dc32c95642a2a714ea08259aa (diff)
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/core/pcm_lib.c4
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 9647a22ed69a..f42c10a43315 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -2311,7 +2311,7 @@ EXPORT_SYMBOL(snd_pcm_lib_readv);
2311/* default channel maps for multi-channel playbacks, up to 8 channels */ 2311/* default channel maps for multi-channel playbacks, up to 8 channels */
2312const struct snd_pcm_chmap_elem snd_pcm_std_chmaps[] = { 2312const struct snd_pcm_chmap_elem snd_pcm_std_chmaps[] = {
2313 { .channels = 1, 2313 { .channels = 1,
2314 .map = { SNDRV_CHMAP_UNKNOWN } }, 2314 .map = { SNDRV_CHMAP_MONO } },
2315 { .channels = 2, 2315 { .channels = 2,
2316 .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, 2316 .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },
2317 { .channels = 4, 2317 { .channels = 4,
@@ -2333,7 +2333,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_std_chmaps);
2333/* alternative channel maps with CLFE <-> surround swapped for 6/8 channels */ 2333/* alternative channel maps with CLFE <-> surround swapped for 6/8 channels */
2334const struct snd_pcm_chmap_elem snd_pcm_alt_chmaps[] = { 2334const struct snd_pcm_chmap_elem snd_pcm_alt_chmaps[] = {
2335 { .channels = 1, 2335 { .channels = 1,
2336 .map = { SNDRV_CHMAP_UNKNOWN } }, 2336 .map = { SNDRV_CHMAP_MONO } },
2337 { .channels = 2, 2337 { .channels = 2,
2338 .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } }, 2338 .map = { SNDRV_CHMAP_FL, SNDRV_CHMAP_FR } },
2339 { .channels = 4, 2339 { .channels = 4,
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 9d432359d1cb..5674cc316530 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1262,7 +1262,7 @@ static struct snd_pcm_ops snd_ensoniq_capture_ops = {
1262 1262
1263static const struct snd_pcm_chmap_elem surround_map[] = { 1263static const struct snd_pcm_chmap_elem surround_map[] = {
1264 { .channels = 1, 1264 { .channels = 1,
1265 .map = { SNDRV_CHMAP_UNKNOWN } }, 1265 .map = { SNDRV_CHMAP_MONO } },
1266 { .channels = 2, 1266 { .channels = 2,
1267 .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } }, 1267 .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
1268 { } 1268 { }
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 50b0804df904..3a6f03f9b02f 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -1264,7 +1264,7 @@ static struct snd_pcm_ops snd_ymfpci_playback_4ch_ops = {
1264 1264
1265static const struct snd_pcm_chmap_elem surround_map[] = { 1265static const struct snd_pcm_chmap_elem surround_map[] = {
1266 { .channels = 1, 1266 { .channels = 1,
1267 .map = { SNDRV_CHMAP_UNKNOWN } }, 1267 .map = { SNDRV_CHMAP_MONO } },
1268 { .channels = 2, 1268 { .channels = 2,
1269 .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } }, 1269 .map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
1270 { } 1270 { }