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

Commit 47933578 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarSylvain 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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 41a6c31d

sound/usb/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -245,8 +245,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 */