diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-05 09:10:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-05 09:10:03 -0700 |
| commit | 83384a6076401a9872b4c26a50f6c0359b0da2e7 (patch) | |
| tree | d8c2e5fa7226059c8f8a7e66041ebfac743d42b9 /drivers/usb | |
| parent | 8312e8d304dc9b0cbaf1b66d5ddf02b41df39343 (diff) | |
| parent | 091b49d5eab10b5ae30b23536e03df5d2cd6844f (diff) | |
Merge "usb: gadget: mtp: Move mutex_init() to alloc_inst_mtp_ptp()"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/function/f_mtp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index 4a0b3a0aa65e..7bfeb93f012c 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -1854,6 +1854,8 @@ struct usb_function_instance *alloc_inst_mtp_ptp(bool mtp_config) config_group_init_type_name(&fi_mtp->func_inst.group, "", &mtp_func_type); + mutex_init(&fi_mtp->dev->read_mutex); + return &fi_mtp->func_inst; } EXPORT_SYMBOL_GPL(alloc_inst_mtp_ptp); @@ -1916,7 +1918,6 @@ struct usb_function *function_alloc_mtp_ptp(struct usb_function_instance *fi, dev->is_ptp = !mtp_config; fi->f = &dev->function; - mutex_init(&dev->read_mutex); return &dev->function; } EXPORT_SYMBOL_GPL(function_alloc_mtp_ptp); |