summaryrefslogtreecommitdiff
path: root/sound/usb
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-08-01 10:16:53 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-01 10:24:16 +0200
commitaff252a848ce21b431ba822de3dab9c4c94571cb (patch)
tree3780933dfad8b9b880baa5fe67a155008cf7295c /sound/usb
parent1f43f6c1bc8d740e75b4177eb29110858bb5fea2 (diff)
downloadlinux-3.10-aff252a848ce21b431ba822de3dab9c4c94571cb.tar.gz
linux-3.10-aff252a848ce21b431ba822de3dab9c4c94571cb.tar.bz2
linux-3.10-aff252a848ce21b431ba822de3dab9c4c94571cb.zip
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. Signed-off-by: Daniel Mack <zonque@gmail.com> Reported-by: Andreas Koch <andreas@akdesigninc.com> Cc: stable@kernel.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/clock.c b/sound/usb/clock.c
index 379baad3d5a..5e634a2eb28 100644
--- a/sound/usb/clock.c
+++ b/sound/usb/clock.c
@@ -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,