Commit 454915dd authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Felipe Balbi

usb: gadget: f_fs: edit epfile->ep under lock

epfile->ep is protected by ffs->eps_lock (not epfile->mutex) so clear it
while holding the spin lock.
Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Tested-by: default avatarChen Yu <chenyu56@huawei.com>
Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent a07ce8d3
...@@ -1725,17 +1725,17 @@ static void ffs_func_eps_disable(struct ffs_function *func) ...@@ -1725,17 +1725,17 @@ static void ffs_func_eps_disable(struct ffs_function *func)
unsigned long flags; unsigned long flags;
do { do {
if (epfile)
mutex_lock(&epfile->mutex);
spin_lock_irqsave(&func->ffs->eps_lock, flags); spin_lock_irqsave(&func->ffs->eps_lock, flags);
/* pending requests get nuked */ /* pending requests get nuked */
if (likely(ep->ep)) if (likely(ep->ep))
usb_ep_disable(ep->ep); usb_ep_disable(ep->ep);
++ep; ++ep;
if (epfile)
epfile->ep = NULL;
spin_unlock_irqrestore(&func->ffs->eps_lock, flags); spin_unlock_irqrestore(&func->ffs->eps_lock, flags);
if (epfile) { if (epfile) {
epfile->ep = NULL; mutex_lock(&epfile->mutex);
kfree(epfile->read_buffer); kfree(epfile->read_buffer);
epfile->read_buffer = NULL; epfile->read_buffer = NULL;
mutex_unlock(&epfile->mutex); mutex_unlock(&epfile->mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment