diff options
| author | Thomas Faber <thfabba@gmx.de> | 2012-03-02 09:41:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-02 16:22:11 -0800 |
| commit | 85b4b3c8c189e0159101f7628a71411af072ff69 (patch) | |
| tree | 77c17a17c1657f5c57f401a686a2a672b7dd8cf6 | |
| parent | 60b9bd8d162174edd335c1b83dbc2bafde1e9d5f (diff) | |
| download | blackbird-op-linux-85b4b3c8c189e0159101f7628a71411af072ff69.tar.gz blackbird-op-linux-85b4b3c8c189e0159101f7628a71411af072ff69.zip | |
usb: gadgetfs: return number of bytes on ep0 read request
A read from GadgetFS endpoint 0 during the data stage of a control
request would always return 0 on success (as returned by
wait_event_interruptible) despite having written data into the user
buffer.
This patch makes it correctly set the return value to the number of
bytes read.
Signed-off-by: Thomas Faber <thfabba@gmx.de>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/gadget/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c index ae04266dba1b..4f18a0e46070 100644 --- a/drivers/usb/gadget/inode.c +++ b/drivers/usb/gadget/inode.c @@ -1043,6 +1043,8 @@ ep0_read (struct file *fd, char __user *buf, size_t len, loff_t *ptr) // FIXME don't call this with the spinlock held ... if (copy_to_user (buf, dev->req->buf, len)) retval = -EFAULT; + else + retval = len; clean_req (dev->gadget->ep0, dev->req); /* NOTE userspace can't yet choose to stall */ } |
