1 files changed, 10 insertions, 20 deletions

diff --git a/drivers/usb/gadget/f_hid.c b/drivers/usb/gadget/f_hid.c
index 511e527178e2..6e69a8e8d22a 100644
--- a/drivers/usb/gadget/f_hid.c
+++ b/drivers/usb/gadget/f_hid.c
@@ -573,7 +573,6 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
                 goto fail;
         hidg_interface_desc.bInterfaceNumber = status;
 
-
         /* allocate instance-specific endpoints */
         status = -ENODEV;
         ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_in_ep_desc);
@@ -609,20 +608,15 @@ static int __init hidg_bind(struct usb_configuration *c, struct usb_function *f)
         hidg_desc.desc[0].wDescriptorLength =
                 cpu_to_le16(hidg->report_desc_length);
 
-        /* copy descriptors */
-        f->descriptors = usb_copy_descriptors(hidg_fs_descriptors);
-        if (!f->descriptors)
-                goto fail;
+        hidg_hs_in_ep_desc.bEndpointAddress =
+                hidg_fs_in_ep_desc.bEndpointAddress;
+        hidg_hs_out_ep_desc.bEndpointAddress =
+                hidg_fs_out_ep_desc.bEndpointAddress;
 
-        if (gadget_is_dualspeed(c->cdev->gadget)) {
-                hidg_hs_in_ep_desc.bEndpointAddress =
-                        hidg_fs_in_ep_desc.bEndpointAddress;
-                hidg_hs_out_ep_desc.bEndpointAddress =
-                        hidg_fs_out_ep_desc.bEndpointAddress;
-                f->hs_descriptors = usb_copy_descriptors(hidg_hs_descriptors);
-                if (!f->hs_descriptors)
-                        goto fail;
-        }
+        status = usb_assign_descriptors(f, hidg_fs_descriptors,
+                        hidg_hs_descriptors, NULL);
+        if (status)
+                goto fail;
 
         mutex_init(&hidg->lock);
         spin_lock_init(&hidg->spinlock);
@@ -649,9 +643,7 @@ fail:
                         usb_ep_free_request(hidg->in_ep, hidg->req);
         }
 
-        usb_free_descriptors(f->hs_descriptors);
-        usb_free_descriptors(f->descriptors);
-
+        usb_free_all_descriptors(f);
         return status;
 }
 
@@ -668,9 +660,7 @@ static void hidg_unbind(struct usb_configuration *c, struct usb_function *f)
         kfree(hidg->req->buf);
         usb_ep_free_request(hidg->in_ep, hidg->req);
 
-        /* free descriptors copies */
-        usb_free_descriptors(f->hs_descriptors);
-        usb_free_descriptors(f->descriptors);
+        usb_free_all_descriptors(f);
 
         kfree(hidg->report_desc);
         kfree(hidg);