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 4DF12315785; Mon, 4 May 2026 14:20:19 +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=1777904419; cv=none; b=FxmVNNREQQQwEr7BzK8VMi32ZK5aJ2PqLCzhsGw8WUduPCoumu2CgrxE0cYrj2rzADt8MUUx4O/8Fz6KelIXwyMNeZvvEYDHkX1oj9ujEst2pG2hPownUMII+xZ2wRQgN/rk9V+CdVujMNy7C5AIp94Btp7U8GV2jFNX06JB/Ac= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904419; c=relaxed/simple; bh=DiDmRllkBbNY7pCwJ2/DXaPtcwe7ZCYSoHr0he+FOeU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A6wilTLGmprc/4JpZf/GQaESZMKHTM0/uTTrMRFkWlzKsBB5mgtVYMrADPr9h4VGubGSWwc7nmt9aw/EnZSuTZxdgcGiGHBlx0gqLecwgm8FRLxIcdkcUKPsaYrogULtXeGxemSE8ROIilqERsaz1IbpysblRxGCQwzH051t2OI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gwLu2PMP; 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="gwLu2PMP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D588BC2BCB8; Mon, 4 May 2026 14:20:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777904419; bh=DiDmRllkBbNY7pCwJ2/DXaPtcwe7ZCYSoHr0he+FOeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gwLu2PMP4x537zP1+NKXL+7DP8oHuVFA+KyAajyDkK4Xb2glRK/8KdV3MaL/9H7am SqBLZuK+H+5GynZLYZTSaPG50XVJnrejiPcCCxuslWM2y7/9oWFfzqEUn/Pnuf5+PN 7V457SgmiYp8yGpf4rgJrrtib1XCK2VUDe+yUuiA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Takashi Iwai Subject: [PATCH 6.12 007/215] ALSA: usb-audio: Evaluate packsize caps at the right place Date: Mon, 4 May 2026 15:50:26 +0200 Message-ID: <20260504135130.443686544@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135130.169210693@linuxfoundation.org> References: <20260504135130.169210693@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Takashi Iwai commit 52521e8398839105ef8eb22b3f0993f9b0d11a57 upstream. We introduced the upper bound checks of the packet sizes by the ep->maxframesize for avoiding the URB submission errors. However, the check was applied at an incorrect place in the function snd_usb_endpoint_set_params() where ep->maxframesize isn't defined yet; the value is defined at a bit later position. So this ended up with a failure at the first run while the second run works. For fixing it, move the check at the correct place, right after the calculation of ep->maxframesize in the same function. Fixes: 7fe8dec3f628 ("ALSA: usb-audio: Cap the packet size pre-calculations") Link: https://bugzilla.kernel.org/show_bug.cgi?id=221292 Cc: Link: https://patch.msgid.link/20260410143220.1676344-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/endpoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -1400,9 +1400,6 @@ int snd_usb_endpoint_set_params(struct s goto unlock; } - ep->packsize[0] = min(ep->packsize[0], ep->maxframesize); - ep->packsize[1] = min(ep->packsize[1], ep->maxframesize); - /* calculate the frequency in 16.16 format */ ep->freqm = ep->freqn; ep->freqshift = INT_MIN; @@ -1429,6 +1426,9 @@ int snd_usb_endpoint_set_params(struct s ep->maxframesize = ep->maxpacksize / ep->cur_frame_bytes; ep->curframesize = ep->curpacksize / ep->cur_frame_bytes; + ep->packsize[0] = min(ep->packsize[0], ep->maxframesize); + ep->packsize[1] = min(ep->packsize[1], ep->maxframesize); + err = update_clock_ref_rate(chip, ep); if (err >= 0) { ep->need_setup = false;