Skip to contentSkip to conversation

alsa: usb: Increase volume range that triggers a warning

PATCH In review Arun Raghavan 2 participants 2 messages Jan 16 – Jan 17 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alsa: usb: Increase volume range that triggers a warning

On at least the HyperX Cloud III, the range is 18944 (-18944 -> 0 in steps of 1), so the original check for 255 steps is definitely obsolete. Let's give ourselves a little more headroom before we emit a warning.

Fixes 80acefff3bc7 ("ALSA: usb-audio - Add volume range check and warn if it too big")
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>
---
 sound/usb/mixer.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
sound/usb/mixer.c +3 -4
index 3af71d42b9b9..90917c6ea871 100644
@@ -1813,11 +1813,10 @@ static void __build_feature_ctl(struct usb_mixer_interface *mixer,
 
 	range = (cval->max - cval->min) / cval->res;
 	/*
-	 * 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.
+	 * There are definitely devices with a range of ~20,000, so let's be
+	 * conservative and allow for a bit more.
 	 */
-	if (range > 384) {
+	if (range > 65535) {
 		usb_audio_warn(mixer->chip,
 			       "Warning! Unlikely big volume range (=%u), cval->res is probably wrong.",
 			       range);
Signature · 1 line
2.52.0
#1 lore raw
Quoted 10 lines · Arun Raghavan

On at least the HyperX Cloud III, the range is 18944 (-18944 -> 0 in steps of 1), so the original check for 255 steps is definitely obsolete. Let's give ourselves a little more headroom before we emit a warning.

Fixes 80acefff3bc7 ("ALSA: usb-audio - Add volume range check and warn if it too big")
Cc Jaroslav Kysela <[email protected]>
Cc Takashi Iwai <[email protected]>

Applied now. Thanks.

Takashi