Merge "USB: f_fs: Fix epfile crash during composition switch" (8f19c20a) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/usb/gadget/f_fs.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -865,10 +865,18 @@ first_try:
		if (unlikely(ret < 0)) {
		/* nop */
		} else if (unlikely(wait_for_completion_interruptible(&done))) {
		ret = -EINTR;
		spin_lock_irq(&epfile->ffs->eps_lock);
		if (ep->ep)
		usb_ep_dequeue(ep->ep, req);
		spin_unlock_irq(&epfile->ffs->eps_lock);
		ret = -EINTR;
		} else {
		spin_lock_irq(&epfile->ffs->eps_lock);
		if (ep->ep)
		ret = ep->status;
		else
		ret = -ENODEV;
		spin_unlock_irq(&epfile->ffs->eps_lock);
		if (read && ret > 0) {
		if (ret > len)
		ret = -EOVERFLOW;