diff options
| author | Rong Zhang <i@rong.moe> | 2026-03-03 22:47:56 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-03-04 14:05:57 +0300 |
| commit | 41d78cb724f4b40b7548af420ccfe524b14023bb (patch) | |
| tree | 427a5f5f764089cef7778642d8947c731fa3cc6f | |
| parent | 0cdccaae8c28a396ed6ac6c4bb6099cfca77d3ce (diff) | |
| download | linux-41d78cb724f4b40b7548af420ccfe524b14023bb.tar.xz | |
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 commit 6b971191fcfc9e3c2c0143eea22534f1f48dbb62.
Fixes: 6b971191fcfc ("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
| -rw-r--r-- | sound/usb/mixer.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ac8c71ba9483..df0d3df9c7ec 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -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); |