diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-19 15:33:17 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2011-02-25 20:25:14 -0800 |
| commit | 29b2c49152786beae6d12988ce250b8e852c7f34 (patch) | |
| tree | 2450cde532c2bfedcbe8a3ab39e053e9d19f0e09 | |
| parent | 91406b03fa4add49db13e55c3220911be55d9883 (diff) | |
| download | qemu-master.tar.gz | |
In mtp_read(), if wait_event_interruptible() returns an error, we need to
remove the request from the EP queue. Else, on the next call to mtp_read(), we
will attempt to enqueue the request again, potentially corrupting the
queue. This is what happens with musb_gadget_queue(), which does not check for
duplicate requests.
Based on a similar change to f_adb.c
Signed-off-by: Mike Lockwood <lockwood@android.com>
| -rw-r--r-- | drivers/usb/gadget/f_mtp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_mtp.c b/drivers/usb/gadget/f_mtp.c index 8128b203e76..92dd89b340b 100644 --- a/drivers/usb/gadget/f_mtp.c +++ b/drivers/usb/gadget/f_mtp.c @@ -504,6 +504,7 @@ requeue_req: ret = wait_event_interruptible(dev->read_wq, dev->rx_done); if (ret < 0) { r = ret; + usb_ep_dequeue(dev->ep_out, req); goto done; } if (dev->state == STATE_BUSY) { |