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 2829231327d4bccfbd2d3acf7f1483ccfbe7f18f..d1c259e3eb2dd087bfe752ba75bb8108717f73ee 100644 (file)
--- 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);