From: Mike Lockwood <lockwood@android.com>
Date: Thu, 13 Jan 2011 21:19:57 +0000 (-0500)
Subject: USB: gadget: f_mtp: Make sure request is dequeued if transfer is canceled
X-Git-Tag: firefly_0821_release~7613^2~681
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50fe49af85a941f6666a09c5bbf891d5044cb615;p=firefly-linux-kernel-4.4.55.git

USB: gadget: f_mtp: Make sure request is dequeued if transfer is canceled

If the host cancels a file transfer while we have a read request pending,
call usb_ep_dequeue to cancel the read.
Also return -ECANCELED from mtp_ioctl if we are canceled in MTP_RECEIVE_FILE

Signed-off-by: Mike Lockwood <lockwood@android.com>
---

diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 64fe3b3cd9e6..e07224fd9f89 100644
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -756,8 +756,10 @@ static void receive_file_work(struct work_struct *data)
 			/* wait for our last read to complete */
 			ret = wait_event_interruptible(dev->read_wq,
 				dev->rx_done || dev->state != STATE_BUSY);
-			if (ret < 0 || dev->state != STATE_BUSY) {
-				r = ret;
+			if (dev->state == STATE_CANCELED) {
+				r = -ECANCELED;
+				if (!dev->rx_done)
+					usb_ep_dequeue(dev->ep_out, read_req);
 				break;
 			}
 			/* if xfer_file_length is 0xFFFFFFFF, then we read until