Merge branch 'bugfix/usb_host/interface_parsing' into 'master'

tore-espressif · tore-espressif · commit bc314e1f8b7b · 2023-02-13T15:17:54.000+08:00
usb_host: Fix interface descriptor parsing

See merge request espressif/esp-idf!22323
diff --git a/components/usb/usb_helpers.c b/components/usb/usb_helpers.c
@@ -76,9 +76,6 @@ int usb_parse_interface_number_of_alternate(const usb_config_desc_t *config_desc
 const usb_intf_desc_t *usb_parse_interface_descriptor(const usb_config_desc_t *config_desc, uint8_t bInterfaceNumber, uint8_t bAlternateSetting, int *offset)
 {
     assert(config_desc != NULL);
-    if (bInterfaceNumber >= config_desc->bNumInterfaces) {
-        return NULL;    //bInterfaceNumber is out of range
-    }
 
     //Walk to first interface descriptor of bInterfaceNumber
     int offset_temp = 0;

Original file line number	Diff line number	Diff line change
`@@ -76,9 +76,6 @@ int usb_parse_interface_number_of_alternate(const usb_config_desc_t *config_desc`
`76`	`76`	`const usb_intf_desc_t usb_parse_interface_descriptor(const usb_config_desc_t config_desc, uint8_t bInterfaceNumber, uint8_t bAlternateSetting, int *offset)`
`77`	`77`	`{`
`78`	`78`	`assert(config_desc != NULL);`
`79`		`- if (bInterfaceNumber >= config_desc->bNumInterfaces) {`
`80`		`- return NULL; //bInterfaceNumber is out of range`
`81`		`- }`
`82`	`79`
`83`	`80`	`//Walk to first interface descriptor of bInterfaceNumber`
`84`	`81`	`int offset_temp = 0;`