diff options
| -rw-r--r-- | drivers/usb/gadget/composite.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 9b1b43a80b14..e4704330030f 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -208,6 +208,7 @@ int usb_add_function(struct usb_configuration *config, goto done; function->config = config; + function->intf_id = -EINVAL; list_add_tail(&function->list, &config->functions); if (function->bind_deactivated) { @@ -356,7 +357,8 @@ int usb_interface_id(struct usb_configuration *config, if (id < MAX_CONFIG_INTERFACES) { config->interface[id] = function; - function->intf_id = id; + if (function->intf_id < 0) + function->intf_id = id; config->next_interface_id = id + 1; return id; } |