diff options
| author | Robert Baldyga <r.baldyga@samsung.com> | 2014-02-10 13:42:42 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-02-18 20:53:01 +0400 |
| commit | 0a7b1f8a70a59fd8215a937f77da20e003b9fc49 (patch) | |
| tree | 44b9cc188c036f0d12edbf25ada48bb8e47549dd /drivers/usb/gadget/f_fs.c | |
| parent | a7ecf0544f0fc710ba6e2ff751d328a4190c4a1f (diff) | |
| download | linux-0a7b1f8a70a59fd8215a937f77da20e003b9fc49.tar.xz | |
usb: gadget: f_fs: fix setup request handling
This patch fixes __ffs_ep0_queue_wait() function, which now returns number of
bytes transferred in USB request or error code in case of failure. This is
needed by ffs_ep0_read() function, when read data is copied to userspace.
It also cleans up code by removing usused variable ep0req_status.
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/f_fs.c')
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index 5bfacf8b9e6e..b65a5029deed 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -228,7 +228,7 @@ static int __ffs_ep0_queue_wait(struct ffs_data *ffs, char *data, size_t len) } ffs->setup_state = FFS_NO_SETUP; - return ffs->ep0req_status; + return req->status ? req->status : req->actual; } static int __ffs_ep0_stall(struct ffs_data *ffs) |