diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
commit | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb (patch) | |
tree | e474f8e2c5ac1712e1e1155b879420dde4aa3922 /sound/usb/mixer.c | |
parent | 24010e460454ec0d2f4f0213b667b4349cbdb8e1 (diff) | |
parent | d6695f09ea30de712662fcf8dd0e8c4d4306a15a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
ALSA: snd-usb-caiaq: Bump version number to 1.3.21
ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
ALSA: snd-usb-caiaq: Simplify single case to an 'if'
ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: usb-audio: fix feature unit parser for UAC2
ALSA: asihpi - Minor code cleanup
ALSA: asihpi - Add support for new ASI8800 family
ALSA: asihpi - Fix bug preventing outstream_write preload from happening
ALSA: asihpi - Fix imbalanced lock path in hw_message
ALSA: asihpi - Remove support for old ASI8800 family
ALSA: asihpi - Add hd radio blend functions
ALSA: asihpi - Remove unused io map functions
ALSA: usb-audio: add support for UAC2 pitch control
ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
ALSA: usb-audio: fix return values
ALSA: usb-audio: parse more format descriptors with structs
sound: Add missing spin_unlock
...
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r-- | sound/usb/mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 97dd17655104..03ce971e0027 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -1126,7 +1126,7 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void | |||
1126 | } else { | 1126 | } else { |
1127 | struct uac2_feature_unit_descriptor *ftr = _ftr; | 1127 | struct uac2_feature_unit_descriptor *ftr = _ftr; |
1128 | csize = 4; | 1128 | csize = 4; |
1129 | channels = (hdr->bLength - 6) / 4; | 1129 | channels = (hdr->bLength - 6) / 4 - 1; |
1130 | bmaControls = ftr->bmaControls; | 1130 | bmaControls = ftr->bmaControls; |
1131 | } | 1131 | } |
1132 | 1132 | ||