diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-07-31 16:19:41 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-07-31 16:22:51 +0200 |
| commit | b7b7e1ab7619deb3b299b5e5c619c3e6f183a12d (patch) | |
| tree | 1577d38e6c8fa8f479ef24eca80d03e6180de94b /sound | |
| parent | ALSA: seq: ump: Explicitly reset RPN with Null RPN (diff) | |
| download | linux-b7b7e1ab7619deb3b299b5e5c619c3e6f183a12d.tar.xz linux-b7b7e1ab7619deb3b299b5e5c619c3e6f183a12d.zip | |
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 <sylvain.bertrand@legeek.net>
Closes: https://lore.kernel.orgZ/qIyJD8lhd8hFhlC@freedom
Fixes: 04324ccc75f9 ("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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index d5409f387945..e14c725acebf 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -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 */ |