aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/comedi/comedi_fops.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 4dd42890c641..2a2b5a06ed0e 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2331,9 +2331,12 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
}
async = s->async;
-
- if (!s->busy || !nbytes)
+ if (!nbytes)
+ goto out;
+ if (!s->busy) {
+ retval = -EINVAL;
goto out;
+ }
if (s->busy != file) {
retval = -EACCES;
goto out;
@@ -2373,8 +2376,10 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
retval = -ERESTARTSYS;
break;
}
- if (!s->busy)
+ if (!s->busy) {
+ retval = -EINVAL;
break;
+ }
if (s->busy != file) {
retval = -EACCES;
break;