diff options
| author | Andy Walls <awalls@radix.net> | 2009-11-05 03:13:58 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 21:41:51 +0100 |
| commit | c37b11bf17b66b960b217c35283aa9c55eacb292 (patch) | |
| tree | e2e805142e89e059342bacdb208a115d5757fcfe /drivers/media/video/cx18/cx18-fileops.c | |
| parent | V4L/DVB (13426): cx18: Rename struct cx18_mdl to struct cx18_mdl_ent (diff) | |
| download | linux-c37b11bf17b66b960b217c35283aa9c55eacb292.tar.xz linux-c37b11bf17b66b960b217c35283aa9c55eacb292.zip | |
V4L/DVB (13427): cx18: Rename struct cx18_queue.buffers to struct cx18_queue.depth
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 04d9c2508b86..e4a3faebff46 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c @@ -229,7 +229,7 @@ static struct cx18_buffer *cx18_get_buffer(struct cx18_stream *s, int non_block, prepare_to_wait(&s->waitq, &wait, TASK_INTERRUPTIBLE); /* New buffers might have become available before we were added to the waitqueue */ - if (!atomic_read(&s->q_full.buffers)) + if (!atomic_read(&s->q_full.depth)) schedule(); finish_wait(&s->waitq, &wait); if (signal_pending(current)) { @@ -543,7 +543,7 @@ unsigned int cx18_v4l2_enc_poll(struct file *filp, poll_table *wait) CX18_DEBUG_HI_FILE("Encoder poll\n"); poll_wait(filp, &s->waitq, wait); - if (atomic_read(&s->q_full.buffers)) + if (atomic_read(&s->q_full.depth)) return POLLIN | POLLRDNORM; if (eof) return POLLHUP; |