mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-16 07:35:14 +00:00
Code Issues Releases Wiki Activity

staging: comedi: comedi_fops: introduce comedi_is_subdevice_in_error()

Browse source 
Introduce, and use, a helper to check the subdevice runflags to see if
the SRF_ERROR flag is set.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-12-19 15:44:02 -07:00 committed by Greg Kroah-Hartman
parent ade1764ff5
commit c098c21a9d
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -382,6 +382,13 @@ bool comedi_is_subdevice_running(struct comedi_subdevice *s)
}
EXPORT_SYMBOL_GPL(comedi_is_subdevice_running);
static bool comedi_is_subdevice_in_error(struct comedi_subdevice *s)
{
unsigned runflags = comedi_get_subdevice_runflags(s);
return (runflags & SRF_ERROR) ? true : false;
}
/*
This function restores a subdevice to an idle state.
*/
@ -1908,12 +1915,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
if (!comedi_is_subdevice_running(s)) {
if (count == 0) {
if (comedi_get_subdevice_runflags(s) &
SRF_ERROR) {
if (comedi_is_subdevice_in_error(s))
retval = -EPIPE;
} else {
else
retval = 0;
}
do_become_nonbusy(dev, s);
}
break;
@ -2015,12 +2020,10 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
if (n == 0) {
if (!comedi_is_subdevice_running(s)) {
do_become_nonbusy(dev, s);
if (comedi_get_subdevice_runflags(s) &
SRF_ERROR) {
if (comedi_is_subdevice_in_error(s))
retval = -EPIPE;
} else {
else
retval = 0;
}
break;
}
if (file->f_flags & O_NONBLOCK) {