Commit 004e5e63 authored Jul 31, 2024 by Takashi Iwai Committed by ZhangPeng Aug 12, 2024

ALSA: usb-audio: Correct surround channels in UAC1 channel map

stable inclusion
from stable-v6.6.45
commit b4dd36f912f21ef34442fde45725f65516628345
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b4dd36f912f21ef34442fde45725f65516628345



--------------------------------

commit b7b7e1ab7619deb3b299b5e5c619c3e6f183a12d upstream.

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 <sylvain.bertrand@legeek.net>
Closes: https://lore.kernel.orgZ/qIyJD8lhd8hFhlC@freedom
Fixes: 04324ccc ("ALSA: usb-audio: add channel map support")
Cc: <stable@vger.kernel.org>
Link: https://patch.msgid.link/20240731142018.24750-1-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>

parent 785a874c

sound/usb/stream.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,8 +244,8 @@ static struct snd_pcm_chmap_elem *convert_chmap(int channels, unsigned int bits,
		SNDRV_CHMAP_FR, /* right front */
		SNDRV_CHMAP_FC, /* center front */
		SNDRV_CHMAP_LFE, /* LFE */
		SNDRV_CHMAP_SL, /* left surround */
		SNDRV_CHMAP_SR, /* right surround */
		SNDRV_CHMAP_RL, /* left surround */
		SNDRV_CHMAP_RR, /* right surround */
		SNDRV_CHMAP_FLC, /* left of center */
		SNDRV_CHMAP_FRC, /* right of center */
		SNDRV_CHMAP_RC, /* surround */