diff options
| author | Ian Abbott <[email protected]> | 2015-10-09 12:26:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2015-10-13 10:28:40 -0700 |
| commit | ecf04ed34d65b735bbdfa9ae8ea378ffc0faa9f6 (patch) | |
| tree | 85160cc9d8cd5f8a89f68a31df9612cbb4ddf9dd | |
| parent | 432fbde739583140c7ee937910786a9d740804c9 (diff) | |
staging: comedi: don't allocate buffer space when polling for write
When handling the "poll" file operation and checking for `POLLOUT`,
don't allocate space from the buffer for writing, just check that space
is available for writing. That check is done after checking that an
asynchronous "write" command is running on the subdevice. Allocating
the buffer space before checking a "write" command is running can cause
problems if the subdevice supports commands in either direction and
currently has an active "read" command.
Signed-off-by: Ian Abbott <[email protected]>
Reviewed-by: H Hartley Sweeten <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index bd124815c06a..42f6971c8061 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2287,10 +2287,9 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait) if (s != s_read) poll_wait(file, &s->async->wait_head, wait); - comedi_buf_write_alloc(s, s->async->prealloc_bufsz); if (!s->busy || !comedi_is_subdevice_running(s) || !(s->async->cmd.flags & CMDF_WRITE) || - comedi_buf_write_n_allocated(s) >= bps) + comedi_buf_write_n_available(s) >= bps) mask |= POLLOUT | POLLWRNORM; } |