Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276320
b: refs/heads/master
c: 6a9ce6b
h: refs/heads/master
v: v3
  • Loading branch information
Federico Vaga authored and Greg Kroah-Hartman committed Nov 27, 2011
1 parent 4ee37ee commit 806beee
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df30b21cb0eed5ba8a8e0cdfeebc66ba8cde821d
refs/heads/master: 6a9ce6b654e491981f6ef7e214cbd4f63e033848
4 changes: 2 additions & 2 deletions trunk/drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1673,11 +1673,11 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
retval = -EAGAIN;
break;
}
schedule();
if (signal_pending(current)) {
retval = -ERESTARTSYS;
break;
}
schedule();
if (!s->busy)
break;
if (s->busy != file) {
Expand Down Expand Up @@ -1780,11 +1780,11 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
retval = -EAGAIN;
break;
}
schedule();
if (signal_pending(current)) {
retval = -ERESTARTSYS;
break;
}
schedule();
if (!s->busy) {
retval = 0;
break;
Expand Down

0 comments on commit 806beee

Please sign in to comment.