From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5539919EEB6; Thu, 15 Aug 2024 13:57:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730231; cv=none; b=AhNCTp7j1iEY9oRg3JFNZ6d5KTftogH7ekBkSAHhSbL5dqg5Bviw++DopLaOo0r7XDLcPe4ex1qCBzE6xsoV3rhZKHL+ef3fPhiLkkJf4sai7l8M31JcLbEblDJRX5U9YipdT6Oa1Uab9orffot2LoxPY70da58B5WCyNE7+it0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723730231; c=relaxed/simple; bh=NowLLmeRDg3l+HiruaRghpFivwomHBKD+q83nZ1pPNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dGlKkbXw4Ttv0E8GW3Azd64GgmPbpNVWGQ/+f68v9aGfn+lUv8m3UZhVH+Ki/JhqlLxDsFAhdHA+Ra9x/mijUhnTpgkVhM4KZpTT0F55M4bPlOYj4Yofq1CIrfZl00g2BLLvwGtVpL9Nlb2Y2BUzml2gpt3wlvl3E5g950XadX8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ei0SXfG6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ei0SXfG6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCEADC32786; Thu, 15 Aug 2024 13:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723730231; bh=NowLLmeRDg3l+HiruaRghpFivwomHBKD+q83nZ1pPNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ei0SXfG6hrO0AZyXNja+jxMdIfmGuGv2rCvIRCVWDSYN10IjgXIHmocK+1dIelIyq /Npbw1nKyeZScO7vkNwxHAcUiOtxNffLnQP4LLjcsTuTHHNIia454vwN7R961wDlif uVNu7K6j2o4YwN45tLf4OaRTj8VsYqKozAGH2gSw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sylvain BERTRAND , Takashi Iwai Subject: [PATCH 5.15 345/484] ALSA: usb-audio: Correct surround channels in UAC1 channel map Date: Thu, 15 Aug 2024 15:23:23 +0200 Message-ID: <20240815131954.747320623@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131941.255804951@linuxfoundation.org> References: <20240815131941.255804951@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai 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 Closes: https://lore.kernel.orgZ/qIyJD8lhd8hFhlC@freedom Fixes: 04324ccc75f9 ("ALSA: usb-audio: add channel map support") Cc: Link: https://patch.msgid.link/20240731142018.24750-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -244,8 +244,8 @@ static struct snd_pcm_chmap_elem *conver 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 */