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=1795056332; b=OGfPR9St16VuWp3MhyN4JETm8pmIPFv4IOZVVyXx2dGiz9oYxI5ulBf9SLTc5M4xtWdw tv2KHGaTS/BifELEFKDXa+mMwDoqKbx94bEob3qqQo4KkJKpYckHjRxt9Cx8M9u9iLLi/ VGA8fFeXDbRyyK1L7Cz1SA/2sGmAB0ZdcKmxLTWbwH5upQolnb6Zy3f+3E9fnA00VZcPK 98jNnf+cep+GBVctXBPvzsz7XgGl294sGPmxXQocmc2Ww1OHgFpOaIcYqYIVZ0khD7qKN BuJFgucP11Na76kBTy9L5TlOoy1agFeGNkuGe3xFSuRON2ufxDT50Sh/CI8M0ZhHnrQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056332; 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=SY2OzGs5p4WcgZIP5E+h3Yhwpp+vahVFLi35ozgW/Hc=; b=x3PbS8GiTdSkXaGewSzFickekbrjQcW7zfhYMata48a8UTiIRwrMqvFvB+WsmgTfKSEs a2NMpGKmoe+kw8/SnVdGMf6jrQ/g1+jhgaAYUAoj25ynzZiSPRqzZxW7fRdAuEVWF6EQR 1C7JoWmBrY6PeQP2pEPssDkORWLcqKlpRCRoM84F7qfbz1TmLr3uOlJSApnsthC8nOyd+ oxzaES8QkeyFbnf6TTNV0BACxiCmpyu2xa2HN/nQTMGlUwAZ45HQPks6skzuFr//hoxcb jiRlBHL5zIHrBxcADcB68TKSfjYXX3GweGrnv3lUsqegWJeefmhTAx5D44Af9bzrulg== 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=G+7OnerE; 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 AA42B606A31C; Thu, 19 Nov 2026 02:45:32 +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=G+7OnerE Received: by smtp.kernel.org (Postfix) with ESMTPSA id 12CD61F000C4; Thu, 19 Nov 2026 02:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056332; bh=SY2OzGs5p4WcgZIP5E+h3Yhwpp+vahVFLi35ozgW/Hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G+7OnerEjkqhOQ959Mzqa+THjpmmSR5S+9l6KN6FMa8YaucYgEaAsM7QQRPwzJRnv pCDeMqs5vJ8qx1Ip7/9FTaUNjsx0tnL7l2hHiEvxvdSCyXL37bfVzEeCMo9LIaV7rY 3iUM59+OQUh9OHq4+9VkCuY48shlpvh8P3YxWnG8= 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.15 1907/2214] ALSA: usb-audio: Use fixed control index for us16x08 mixer elements Date: Wed, 18 Nov 2026 15:59:43 +0100 Message-ID: <20261118150127.400261200@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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.15-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 091759147935a..9ccf9fda5c98f 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -582,20 +582,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 e3f3740204f54..df76e5a10a252 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 3cda197c7b137..40aefb6ac99ab 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 dc591f6f29c3f..38ec3b32222f0 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, strscpy(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