diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-09-13 14:48:46 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-09-13 14:48:46 +0200 |
commit | 5efbc2610a7b2aac6c51f8fc943c019106568939 (patch) | |
tree | 93112efdb376d895d17f2dd54df212ddb186eba0 | |
parent | 7b31d0095e87221dc32c95642a2a714ea08259aa (diff) | |
download | op-kernel-dev-5efbc2610a7b2aac6c51f8fc943c019106568939.zip op-kernel-dev-5efbc2610a7b2aac6c51f8fc943c019106568939.tar.gz |
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>
-rw-r--r-- | sound/core/pcm_lib.c | 4 | ||||
-rw-r--r-- | sound/pci/ens1370.c | 2 | ||||
-rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 9647a22..f42c10a 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -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, diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 9d43235..5674cc3 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c @@ -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 } }, { } diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 50b0804..3a6f03f 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 = { 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 } }, { } |