summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorJerry Zhang <zhangjerry@google.com>2017-08-11 15:46:08 -0700
committerFelipe Balbi <felipe.balbi@linux.intel.com>2017-08-15 14:18:59 +0300
commitcdff9f8ee1688f79351518ef03780bf11b5283be (patch)
tree5f551dff98f008f680eebb8d9767aed4002c2c00 /drivers/usb
parentcc29d4f67757f2bce7fca1a0eab8e40d748b0ead (diff)
downloadtalos-obmc-linux-cdff9f8ee1688f79351518ef03780bf11b5283be.tar.gz
talos-obmc-linux-cdff9f8ee1688f79351518ef03780bf11b5283be.zip
usb: gadget: f_fs: Pass along set_halt errors.
Users can apply i/o in the wrong direction on an endpoint to stall it. In case there is an error that does not allow the endpoint to be stalled, we want the user to know. An operation to stall the endpoint will return EBADMSG if successful, EAGAIN if there are still queued requests, and other errors depending on the underlying implementation. Also remove the conditional since it is always true. Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Jerry Zhang <zhangjerry@google.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/function/f_fs.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index d21874b35cf6..9990944a7245 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -961,10 +961,9 @@ static ssize_t ffs_epfile_io(struct file *file, struct ffs_io_data *io_data)
/* In the meantime, endpoint got disabled or changed. */
ret = -ESHUTDOWN;
} else if (halt) {
- /* Halt */
- if (likely(epfile->ep == ep) && !WARN_ON(!ep->ep))
- usb_ep_set_halt(ep->ep);
- ret = -EBADMSG;
+ ret = usb_ep_set_halt(ep->ep);
+ if (!ret)
+ ret = -EBADMSG;
} else if (unlikely(data_len == -EINVAL)) {
/*
* Sanity Check: even though data_len can't be used
OpenPOWER on IntegriCloud