Skip to content

Commit

Permalink
staging: comedi: comedi_fops: introduce comedi_is_subdevice_in_error()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent ade1764 commit c098c21
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit c098c21

Please sign in to comment.