summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
authorReinhard Panhuber <[email protected]>2020-06-14 12:36:59 +0200
committerReinhard Panhuber <[email protected]>2020-06-14 12:36:59 +0200
commit930817221d7531b3b47fb71d296947346cab5d8b (patch)
treecae1c3c039e77eb3051c6611ee6c6b7a1657a3e4 /src/device
parent4362665fb3ec1ef0d749bbcdaabe161ce1c06614 (diff)
parent48b2e6cf78a3c3a321715938e40166138ed605f5 (diff)
Merge branch 'fix-too-strict-iad-checks' into uac2
Conflicts: src/device/usbd.c
Diffstat (limited to 'src/device')
-rw-r--r--src/device/usbd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 912c922c5..6e2e5635a 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -778,9 +778,7 @@ static bool process_set_config(uint8_t rhport, uint8_t cfg_num)
{
// IAD's first interface number and class/subclass/protocol should match with opened interface
TU_ASSERT(desc_itf_assoc->bFirstInterface == desc_itf->bInterfaceNumber &&
- desc_itf_assoc->bFunctionClass == desc_itf->bInterfaceClass &&
- // desc_itf_assoc->bFunctionSubClass == desc_itf->bInterfaceSubClass &&
- desc_itf_assoc->bFunctionProtocol == desc_itf->bInterfaceProtocol);
+ desc_itf_assoc->bFunctionClass == desc_itf->bInterfaceClass);
for(uint8_t i=1; i<desc_itf_assoc->bInterfaceCount; i++)
{