Merge "usb: gadget: f_mtp: Handle OS descriptors properly"

diff --cc drivers/usb/gadget/function/f_mtp.c
index 7bfeb93,5605dfb..6ee21d0
--- 1/drivers/usb/gadget/function/f_mtp.c
--- 2/drivers/usb/gadget/function/f_mtp.c
+++ b/drivers/usb/gadget/function/f_mtp.c
@@@ -1916,8 -1917,8 +1919,7 @@@ struct usb_function *function_alloc_mtp
        dev->function.setup = mtp_ctrlreq_configfs;
        dev->function.free_func = mtp_free;
        dev->is_ptp = !mtp_config;
-       fi->f = &dev->function;
  
 -      mutex_init(&dev->read_mutex);
        return &dev->function;
  }
  EXPORT_SYMBOL_GPL(function_alloc_mtp_ptp);