evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-05 09:10:04 -07:00 • committed by Gerrit - the friendly Code Review server
commit 83384a6076
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/usb/gadget/function/f_mtp.c
View file

@ -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, config_group_init_type_name(&fi_mtp->func_inst.group,
"", &mtp_func_type); "", &mtp_func_type);
mutex_init(&fi_mtp->dev->read_mutex);
return &fi_mtp->func_inst; return &fi_mtp->func_inst;
} }
EXPORT_SYMBOL_GPL(alloc_inst_mtp_ptp); 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; dev->is_ptp = !mtp_config;
fi->f = &dev->function; fi->f = &dev->function;
mutex_init(&dev->read_mutex);
return &dev->function; return &dev->function;
} }
EXPORT_SYMBOL_GPL(function_alloc_mtp_ptp); EXPORT_SYMBOL_GPL(function_alloc_mtp_ptp);