Skip to contentSkip to conversation

ALSA: snd-usb: fix clock source validity index

PATCH In review Daniel Mack 2 participants 2 messages Aug 1, 2012 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: snd-usb: fix clock source validity index

uac_clock_source_is_valid() uses the control selector value to access the bmControls bitmap of the clock source unit. This is wrong, as control selector values start from 1, while the bitmap uses all available bits.

In other words, "Clock Validity Control" is stored in D3..2, not D5..4 of the clock selector unit's bmControls.

---
 sound/usb/clock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/usb/clock.c +2 -1
index 379baad..5e634a2 100644
@@ -111,7 +111,8 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
 		return 0;
 
 	/* If a clock source can't tell us whether it's valid, we assume it is */
-	if (!uac2_control_is_readable(cs_desc->bmControls, UAC2_CS_CONTROL_CLOCK_VALID))
+	if (!uac2_control_is_readable(cs_desc->bmControls,
+				      UAC2_CS_CONTROL_CLOCK_VALID - 1))
 		return 1;
 
 	err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
Signature · 1 line
1.7.11.2
#1 lore raw

At Wed, 1 Aug 2012 10:16:53 +0200,

Quoted 6 lines · Daniel Mack

uac_clock_source_is_valid() uses the control selector value to access the bmControls bitmap of the clock source unit. This is wrong, as control selector values start from 1, while the bitmap uses all available bits.

Quoted 6 lines

In other words, "Clock Validity Control" is stored in D3..2, not D5..4 of the clock selector unit's bmControls.

Applied now. Thanks.

Takashi

Quoted 21 lines
---
 sound/usb/clock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/usb/clock.c +2 -1
index 379baad..5e634a2 100644
@@ -111,7 +111,8 @@ static bool uac_clock_source_is_valid(struct snd_usb_audio *chip, int source_id)
 		return 0;
 
 	/* If a clock source can't tell us whether it's valid, we assume it is */
-	if (!uac2_control_is_readable(cs_desc->bmControls, UAC2_CS_CONTROL_CLOCK_VALID))
+	if (!uac2_control_is_readable(cs_desc->bmControls,
+				      UAC2_CS_CONTROL_CLOCK_VALID - 1))
 		return 1;
 
 	err = snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0), UAC2_CS_CUR,
Signature · 1 line
1.7.11.2