From: Linux Build Service Account <lnxbuild@quicinc.com>
Date: Thu, 11 May 2017 06:04:00 +0000 (-0700)
Subject: Merge "usb: gadget: f_mtp: Handle OS descriptors properly"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8e831a70d3cfcec2a990e6a5d9a2ea61fc47876a;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

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

8e831a70d3cfcec2a990e6a5d9a2ea61fc47876a
diff --cc drivers/usb/gadget/function/f_mtp.c
index 7bfeb93f012c,5605dfb6f05b..6ee21d039415
--- a/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);