diff options
| author | Federico Vaga <federico.vaga@gmail.com> | 2011-10-29 09:47:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 09:21:42 -0800 |
| commit | 117dabceadaac646d2e943ecb570920d4be2f521 (patch) | |
| tree | d843e93121b695aca6322ab444e93fe3f741988d | |
| parent | 300b30288b4e80da922b09db76bdef5ddfd676e6 (diff) | |
| download | linux-stable-117dabceadaac646d2e943ecb570920d4be2f521.tar.gz linux-stable-117dabceadaac646d2e943ecb570920d4be2f521.tar.bz2 linux-stable-117dabceadaac646d2e943ecb570920d4be2f521.zip | |
Staging: comedi: fix signal handling in read and write
commit 6a9ce6b654e491981f6ef7e214cbd4f63e033848 upstream.
After sleeping on a wait queue, signal_pending(current) should be
checked (not before sleeping).
Acked-by: Alessandro Rubini <rubini@gnudd.com>
Signed-off-by: Federico Vaga <federico.vaga@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 7bd7436c50c9..908f25a51455 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1599,11 +1599,11 @@ static ssize_t comedi_write(struct file *file, const char *buf, size_t nbytes, retval = -EAGAIN; break; } + schedule(); if (signal_pending(current)) { retval = -ERESTARTSYS; break; } - schedule(); if (!s->busy) break; if (s->busy != file) { @@ -1706,11 +1706,11 @@ static ssize_t comedi_read(struct file *file, char *buf, size_t nbytes, retval = -EAGAIN; break; } + schedule(); if (signal_pending(current)) { retval = -ERESTARTSYS; break; } - schedule(); if (!s->busy) { retval = 0; break; |