aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-08 11:41:03 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-08 11:41:03 +0200
commit2aa3f554ee4c50b263f4cc5494a10136e374bef9 (patch)
tree0eb5a1eb49c68e803583aa7f43c5987bd44ab99a
parentc720faea5326521b2c23bbe239b4d9d4785cb371 (diff)
downloadalsa-driver-build-unstable-2aa3f554ee4c50b263f4cc5494a10136e374bef9.tar.gz
Fix regression for class1 usbaudio device support
Backport fix from sound tree. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/usb_audio_compat.h2
-rw-r--r--kconfig-vers2
2 files changed, 1 insertions, 3 deletions
diff --git a/include/usb_audio_compat.h b/include/usb_audio_compat.h
index 905a87caf..57f205519 100644
--- a/include/usb_audio_compat.h
+++ b/include/usb_audio_compat.h
@@ -244,7 +244,7 @@ struct uac_selector_unit_descriptor {
static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc)
{
__u8 *raw = (__u8 *) desc;
- return raw[desc->bLength - 1];
+ return raw[9 + desc->bLength - 1];
}
/* 4.3.2.5 Feature Unit Descriptor */
diff --git a/kconfig-vers b/kconfig-vers
index 1cebb91c2..1e2a97cfd 100644
--- a/kconfig-vers
+++ b/kconfig-vers
@@ -22,5 +22,3 @@ SND_JACK 2.6.27
SND_FM801_TEA575X_BOOL 2.6.27
SND_USB_UA101 2.6.32
SND_LX6464ES 2.6
-SND_ES1968_INPUT 2.6.22
-SND_MAESTRO3_INPUT 2.6.22