mirror of
https://github.com/torvalds/linux.git
synced 2026-05-31 10:33:41 +02:00
Revert "ALSA: usb: Increase volume range that triggers a warning"
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 commit6b971191fc. Fixes:6b971191fc("ALSA: usb: Increase volume range that triggers a warning") Cc: stable@vger.kernel.org Signed-off-by: Rong Zhang <i@rong.moe> Acked-by: Arun Raghavan <arunr@valvesoftware.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/20260303194805.266158-2-i@rong.moe
This commit is contained in:
parent
0cdccaae8c
commit
41d78cb724
|
|
@ -1813,10 +1813,11 @@ static void __build_feature_ctl(struct usb_mixer_interface *mixer,
|
|||
|
||||
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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user