Skip to content

Commit b7b7e1a

Browse files
committed
ALSA: usb-audio: Correct surround channels in UAC1 channel map
USB-audio driver puts SNDRV_CHMAP_SL and _SR as left and right surround channels for UAC1 channel map, respectively. But they should have been SNDRV_CHMAP_RL and _RR; the current value *_SL and _SR are rather "side" channels, not "surround". I guess I took those mistakenly when I read the spec mentioning "surround left". This patch corrects those entries to be the right channels. Suggested-by: Sylvain BERTRAND <[email protected]> Closes: https://lore.kernel.orgZ/qIyJD8lhd8hFhlC@freedom Fixes: 04324cc ("ALSA: usb-audio: add channel map support") Cc: <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 98ea612 commit b7b7e1a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/usb/stream.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
244244
SNDRV_CHMAP_FR, /* right front */
245245
SNDRV_CHMAP_FC, /* center front */
246246
SNDRV_CHMAP_LFE, /* LFE */
247-
SNDRV_CHMAP_SL, /* left surround */
248-
SNDRV_CHMAP_SR, /* right surround */
247+
SNDRV_CHMAP_RL, /* left surround */
248+
SNDRV_CHMAP_RR, /* right surround */
249249
SNDRV_CHMAP_FLC, /* left of center */
250250
SNDRV_CHMAP_FRC, /* right of center */
251251
SNDRV_CHMAP_RC, /* surround */

0 commit comments

Comments
 (0)