From: JacobChen <cc@rock-chips.com>
Date: Mon, 5 Dec 2011 07:00:31 +0000 (+0800)
Subject: Mtp func: prevent dev state change frome cancel to error.
X-Git-Tag: firefly_0821_release~9731
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2c6dd7f8291a60c064bb194858cb28b2a50056b1;p=firefly-linux-kernel-4.4.55.git

Mtp func: prevent dev state change frome cancel to error.
---

diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c
index 2829231327d4..d1c259e3eb2d 100644
--- a/drivers/usb/gadget/f_mtp.c
+++ b/drivers/usb/gadget/f_mtp.c
@@ -362,7 +362,7 @@ static void mtp_complete_out(struct usb_ep *ep, struct usb_request *req)
 	struct mtp_dev *dev = _mtp_dev;
 
 	dev->rx_done = 1;
-	if (req->status != 0)
+	if (req->status != 0 && dev->state != STATE_CANCELED)
 		dev->state = STATE_ERROR;
 
 	wake_up(&dev->read_wq);