Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795061643; b=xNvUOTKj2QOF9z4YpeJqmZcxdblGHsYSOFsYqngDrxcfGuM3UUJej6skmeg88ldz6Cik eDFv9Fnswo0NTAqTgUjpLmdNPRrrKIBI4EIIJ69mDh1ZSrTZp9dkN9mhXMfnEu19TbCkC nFp3mbY7+xTjL/hi03L10+Gx/gJm68hM/ceYYEQR2biwPfgJ/uUHkbR426CPIu9y7fC4i sKyhBdt5rCTKImabGy03gEymq9X+rt1wQ//bzaLFcVaxxwr/RVwrhXlXwp0NEYeRtG+j9 XGicvkT+QGtmOsKYYAevmhuRMyTKNDu2RRLxsIHYDl9LF9Zi/GIqG5Dom8U+9TiNXeg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061643; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=TkbB0nG4bCJjfPJEfMofUzcx6HpH4il+wflr+Q37PgY=; b=pkwX38u6q+P8x5qc8u3c3tZQ9GTtgtZjbBdUdvDAGMmTlAbndLtg+mPH42q9MNII+ZOt lVYxX7+/S1iFpYf/x7guJ6VUv3uRRl0EJdaR8MIZF/mKSbcg4LF6sCSGqC+LHrRjEH7ll fE2NBcFlVm65FRRvxL7+oi7gnWO0c7/xFlGX8CcLX8bjXR4K6N6AG+e1SUFaCFBkVWbr2 NeamCE8wRsH/QgXI0XxxE++gPsbP3KhXwsT2pIDLQiN2ZwMEThSN3U5mghCp01krVnmfv qP6q7ld3GCV5SNLOTh9a54gINtlDIVmsDqBzn91gigqp+hXv2bHCUiez/6884jzdH9g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=DYeL+2CK; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2B4DC606A320; Thu, 19 Nov 2026 04:14:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=DYeL+2CK Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A31D1F000C4; Thu, 19 Nov 2026 04:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061643; bh=TkbB0nG4bCJjfPJEfMofUzcx6HpH4il+wflr+Q37PgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DYeL+2CKtutfTq5IxdrF/30O2cylXaZXM1B46Ai+tuK2636whUAyECGgRsfzolLmK VgAdImDrmsUjpYrgI1rsOx0iSs6zZK0PSV0ew2NxCgPFT13pJ7FXhuCasI1VW6o6ZZ IPW5kuiw733gOrr8ajL1bqK15LQSXHUp1gU/aSrs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sashiko , Takashi Iwai , Sasha Levin Subject: [PATCH 5.10 1625/1848] ALSA: usb-audio: Use fixed control index for us16x08 mixer elements Date: Wed, 18 Nov 2026 16:01:03 +0100 Message-ID: <20261118150027.590663045@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai [ Upstream commit a68a688ce220f1b359bec53fa38d1504314dc70f ] The callbacks for us16x08 mixer elements assume that id.index points to the channel to be operated, and the assumption is correct for now. However, since the kctls are added via snd_usb_mixer_add_control() and it looks for the empty slot if the same control name is already present, in theory, the index can become more than the channel numbers (if a conflicting name really happens). Since the mixer code in us16x08 doesn't need the search for an empty slot but requires the fixed index, this patch changes slightly how to assign the kcontrols. Now, a new argument is added to snd_usb_mixer_add_list() in order to disable the empty slot search, and use it in us16x08's add_new_ctl() helper function, instead. Fixes: d2bb390a2081 ("ALSA: usb-audio: Tascam US-16x08 DSP mixer quirk") Reported-by: Sashiko Link: https://patch.msgid.link/20261014061406.162938-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/mixer.c | 13 +++++++++---- sound/usb/mixer.h | 5 +++-- sound/usb/mixer_quirks.c | 2 +- sound/usb/mixer_us16x08.c | 3 ++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 77e6a59dc9927..8329c5c9c886f 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -576,20 +576,25 @@ static int check_matrix_bitmap(unsigned char *bmap, /* * add an alsa control element - * search and increment the index until an empty slot is found. + * when @look_for_empty is set, search and increment the index until an empty + * slot is found. * * if failed, give up and free the control instance. */ int snd_usb_mixer_add_list(struct usb_mixer_elem_list *list, struct snd_kcontrol *kctl, - bool is_std_info) + bool is_std_info, + bool look_for_empty) { struct usb_mixer_interface *mixer = list->mixer; int err; - while (snd_ctl_find_id(mixer->chip->card, &kctl->id)) - kctl->id.index++; + if (look_for_empty) { + while (snd_ctl_find_id(mixer->chip->card, &kctl->id)) + kctl->id.index++; + } + err = snd_ctl_add(mixer->chip->card, kctl); if (err < 0) { usb_audio_dbg(mixer->chip, "cannot add control (err = %d)\n", diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 6d20ba7ee88fd..83cb46cd973cc 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -107,10 +107,11 @@ int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, int snd_usb_mixer_add_list(struct usb_mixer_elem_list *list, struct snd_kcontrol *kctl, - bool is_std_info); + bool is_std_info, + bool look_for_empty); #define snd_usb_mixer_add_control(list, kctl) \ - snd_usb_mixer_add_list(list, kctl, true) + snd_usb_mixer_add_list(list, kctl, true, true) void snd_usb_mixer_elem_init_std(struct usb_mixer_elem_list *list, struct usb_mixer_interface *mixer, diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index f1012c1b99fb2..fe78ae993014a 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -162,7 +162,7 @@ static int add_single_ctl_with_resume(struct usb_mixer_interface *mixer, } kctl->private_free = snd_usb_mixer_elem_free; /* don't use snd_usb_mixer_add_control() here, this is a special list element */ - return snd_usb_mixer_add_list(list, kctl, false); + return snd_usb_mixer_add_list(list, kctl, false, true); } /* diff --git a/sound/usb/mixer_us16x08.c b/sound/usb/mixer_us16x08.c index d8a8d90be58e1..757d5a7a3d490 100644 --- a/sound/usb/mixer_us16x08.c +++ b/sound/usb/mixer_us16x08.c @@ -1112,7 +1112,8 @@ static int add_new_ctl(struct usb_mixer_interface *mixer, strlcpy(kctl->id.name, name, sizeof(kctl->id.name)); - err = snd_usb_mixer_add_control(&elem->head, kctl); + /* look_for_empty=false, as we want the fixed id.index as channel */ + err = snd_usb_mixer_add_list(&elem->head, kctl, true, false); if (err < 0) return err; -- 2.53.0