summaryrefslogtreecommitdiff
path: root/sound/usb/endpoint.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
committerColin Cross <ccross@android.com>2011-10-27 15:01:19 -0700
commit2bb3e310159b65c88caf0c67a20ed257568be267 (patch)
treee4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /sound/usb/endpoint.c
parent2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff)
parent97596c34030ed28657ccafddb67e17a03890b90a (diff)
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'sound/usb/endpoint.c')
-rw-r--r--sound/usb/endpoint.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index b0ef9f501896..05842c8b0672 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -352,7 +352,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
continue;
}
if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) ||
- ((protocol == UAC_VERSION_2) && (fmt->bLength != 6))) {
+ ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) {
snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
dev->devnum, iface_no, altno);
continue;