|
@@ -555,6 +555,9 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,
|
|
|
unsigned iad_num = 0;
|
|
|
|
|
|
memcpy(&config->desc, buffer, USB_DT_CONFIG_SIZE);
|
|
|
+ nintf = nintf_orig = config->desc.bNumInterfaces;
|
|
|
+ config->desc.bNumInterfaces = 0; // Adjusted later
|
|
|
+
|
|
|
if (config->desc.bDescriptorType != USB_DT_CONFIG ||
|
|
|
config->desc.bLength < USB_DT_CONFIG_SIZE ||
|
|
|
config->desc.bLength > size) {
|
|
@@ -568,7 +571,6 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx,
|
|
|
buffer += config->desc.bLength;
|
|
|
size -= config->desc.bLength;
|
|
|
|
|
|
- nintf = nintf_orig = config->desc.bNumInterfaces;
|
|
|
if (nintf > USB_MAXINTERFACES) {
|
|
|
dev_warn(ddev, "config %d has too many interfaces: %d, "
|
|
|
"using maximum allowed: %d\n",
|