commit 427486843488f67acd9d1b8f574a0482631ba2fc
author Linux Build Service Account <lnxbuild@quicinc.com> Tue Aug 08 19:44:38 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 08 19:44:38 2017 -0700
tree b0d8cbf60779449f5ec47cf514a88cbed4f98115
parent d6a847bc01f5d5969488bd00bf655cdee699ea1b
parent 56703d11362649105ede114a7821106c9408bdc0

Merge "usb: gadget: mtp: Move mutex_init() to alloc_inst_mtp_ptp()"

drivers/usb/gadget/function/f_mtp.c

diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c
index 451e380..ca8ed69 100644
--- a/drivers/usb/gadget/function/f_mtp.c
+++ b/drivers/usb/gadget/function/f_mtp.c
@@ -1826,6 +1826,8 @@
 	usb_os_desc_prepare_interf_dir(&fi_mtp->func_inst.group, 1,
 					descs, names, THIS_MODULE);
 
+	mutex_init(&fi_mtp->dev->read_mutex);
+
 	return  &fi_mtp->func_inst;
 }
 EXPORT_SYMBOL_GPL(alloc_inst_mtp_ptp);
@@ -1887,7 +1889,6 @@
 	dev->function.free_func = mtp_free;
 	fi->f = &dev->function;
 
-	mutex_init(&dev->read_mutex);
 	return &dev->function;
 }
 EXPORT_SYMBOL_GPL(function_alloc_mtp_ptp);