mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

staging: comedi: simplify returned errors for comedi_read()

Browse source 
In order to perform a "read" file operation, an asynchronous COMEDI
command in the "read" direction needs to have been set up by the current
file object on the COMEDI "read" subdevice associated with the file
object.  If there is a "read" subdevice, but a command has not been set
up by the file object (or is has been set-up in the wrong direction),
`comedi_read()` currently returns one of two error values `-EINVAL` or
`-EACCES`.  `-EACCES` is returned if the command was set up by a
different subdevice, or somewhat randomly, if a COMEDI "instruction" is
currently being processed.  `-EINVAL` is returned in other cases.
Simplify it by returning `-EINVAL` for all these cases.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott 2015-10-12 17:21:28 +01:00 committed by Greg Kroah-Hartman
parent a8ed75c083
commit 3958284775
1 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/staging/comedi/comedi_fops.c
View file

@ -2480,15 +2480,7 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
async = s->async;
if (!nbytes)
goto out;
if (!s->busy) {
retval = -EINVAL;
goto out;
}
if (s->busy != file) {
retval = -EACCES;
goto out;
}
if (async->cmd.flags & CMDF_WRITE) {
if (s->busy != file || (async->cmd.flags & CMDF_WRITE)) {
retval = -EINVAL;
goto out;
}
@ -2520,15 +2512,8 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
retval = -ERESTARTSYS;
break;
}
if (!s->busy) {
retval = -EINVAL;
break;
}
if (s->busy != file) {
retval = -EACCES;
break;
}
if (async->cmd.flags & CMDF_WRITE) {
if (s->busy != file ||
(async->cmd.flags & CMDF_WRITE)) {
retval = -EINVAL;
break;
}