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 88FC635A3AD; Mon, 4 May 2026 14:21:00 +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=1777904460; cv=none; b=tIdzFRrw07uLr4r99TNlNF+i8XP9s0dFiGJoldrmzBMAHAlIiimdBKgBQopLDnouhfJcRVWabUk6dmoZZWc+sLLqkAqexSQe+BBOKRBH9tSpEmUibkAE/IZsgFpBkZyHGoALqm4QCBTIsKZ4FL9pzktCZmiA0gUr0Kk9GG4xcxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904460; c=relaxed/simple; bh=mqnKWp7Y9njFv399vCzCHy8L8kDLCZoHypn50SMyUQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RZC5EGrxYEkAmulWIAsoHmowCqUxS/94yxN3el5NwHB/eUkhH80Uippq3RkpGzIT8zVsuUZZO0lHPa2ICmmEzuZXTrFPCcU5P6KOi3Y+csjRTH42y8b4d6+kaBE77ux9xZbide+YtrCibVYWbAB3BafDbwRwUHJrI6t0O5xx2sA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=klKNSUYo; 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="klKNSUYo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FD7EC2BCB8; Mon, 4 May 2026 14:20:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777904460; bh=mqnKWp7Y9njFv399vCzCHy8L8kDLCZoHypn50SMyUQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=klKNSUYoKSuHi2jD08eyb5m26HWPCp+d1tiKIr4xRPStupiemsMKhcGArtn32iXAA mrJ5bOi7oWLM1hOwvW8AuzBsqnSZ8nP5c3TROR4oz7ZPJNdbDyWyySCHsJcZLalnJJ AfV+hyQSWMtnRWoP0hib6JEyoDTtkyiWW8zRtcRY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rong Zhang , Arun Raghavan , Takashi Iwai Subject: [PATCH 6.12 047/215] Revert "ALSA: usb: Increase volume range that triggers a warning" Date: Mon, 4 May 2026 15:51:06 +0200 Message-ID: <20260504135131.898417296@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: Rong Zhang commit 41d78cb724f4b40b7548af420ccfe524b14023bb upstream. UAC uses 2 bytes to store volume values, so the maximum volume range is 0xFFFF (65535, val = -32768/32767/1). The reverted commit bumpped the range of triggering the warning to > 65535, effectively making the range check a no-op. It didn't fix anything but covered any potential problems and deviated from the original intention of the range check. This reverts commit 6b971191fcfc9e3c2c0143eea22534f1f48dbb62. Fixes: 6b971191fcfc ("ALSA: usb: Increase volume range that triggers a warning") Cc: stable@vger.kernel.org Signed-off-by: Rong Zhang Acked-by: Arun Raghavan Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/20260303194805.266158-2-i@rong.moe Signed-off-by: Greg Kroah-Hartman --- sound/usb/mixer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1814,10 +1814,11 @@ static void __build_feature_ctl(struct u range = (cval->max - cval->min) / cval->res; /* - * There are definitely devices with a range of ~20,000, so let's be - * conservative and allow for a bit more. + * Are there devices with volume range more than 255? I use a bit more + * to be sure. 384 is a resolution magic number found on Logitech + * devices. It will definitively catch all buggy Logitech devices. */ - if (range > 65535) { + if (range > 384) { usb_audio_warn(mixer->chip, "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.", range);