3 files changed, 7 insertions, 3 deletions

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index fadd6be26834..97142146eead 100644
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1216,6 +1216,7 @@ static struct configfs_attribute *interf_grp_attrs[] = {
 int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                                    int n_interf,
                                    struct usb_os_desc **desc,
+                                   char **names,
                                    struct module *owner)
 {
         struct config_group **f_default_groups, *os_desc_group,
@@ -1257,8 +1258,8 @@ int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                 d = desc[n_interf];
                 d->owner = owner;
                 config_group_init_type_name(&d->group, "", interface_type);
-                config_item_set_name(&d->group.cg_item, "interface.%d",
-                                     n_interf);
+                config_item_set_name(&d->group.cg_item, "interface.%s",
+                                     names[n_interf]);
                 interface_groups[n_interf] = &d->group;
         }
 
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h
index a14ac792c698..36c468c4f5e9 100644
--- a/drivers/usb/gadget/configfs.h
+++ b/drivers/usb/gadget/configfs.h
@@ -8,6 +8,7 @@ void unregister_gadget_item(struct config_item *item);
 int usb_os_desc_prepare_interf_dir(struct config_group *parent,
                                    int n_interf,
                                    struct usb_os_desc **desc,
+                                   char **names,
                                    struct module *owner);
 
 static inline struct usb_os_desc *to_usb_os_desc(struct config_item *item)
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 31274f70c4b9..9c41e9515b8e 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -905,6 +905,7 @@ static struct usb_function_instance *rndis_alloc_inst(void)
 {
         struct f_rndis_opts *opts;
         struct usb_os_desc *descs[1];
+        char *names[1];
 
         opts = kzalloc(sizeof(*opts), GFP_KERNEL);
         if (!opts)
@@ -922,8 +923,9 @@ static struct usb_function_instance *rndis_alloc_inst(void)
         INIT_LIST_HEAD(&opts->rndis_os_desc.ext_prop);
 
         descs[0] = &opts->rndis_os_desc;
+        names[0] = "rndis";
         usb_os_desc_prepare_interf_dir(&opts->func_inst.group, 1, descs,
-                                       THIS_MODULE);
+                                       names, THIS_MODULE);
         config_group_init_type_name(&opts->func_inst.group, "",
                                     &rndis_func_type);