diff options
| author | Seung-Woo Kim | 2013-05-21 04:47:29 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-06-03 20:30:30 +0200 |
| commit | 412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655 (patch) | |
| tree | c1500573ff40e079f44966edc1b83439b05e3a35 | |
| parent | [media] s5p-mfc: Update v6 encoder buffer alloc (diff) | |
| download | kernel-qcow2-linux-412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655.tar.gz kernel-qcow2-linux-412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655.tar.xz kernel-qcow2-linux-412cb87d28a1f299ee82fe1c8bfe6cbeec9a4655.zip | |
[media] media: vb2: return for polling if a buffer is available
The vb2_poll() does not need to wait next vb_buffer_done() if there is already
a buffer in done_list of queue, but current vb2_poll() always waits.
So done_list is checked before calling poll_wait().
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/v4l2-core/videobuf2-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 7d833eefaf4e..e3bdc3be91e1 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2014,7 +2014,8 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) if (list_empty(&q->queued_list)) return res | POLLERR; - poll_wait(file, &q->done_wq, wait); + if (list_empty(&q->done_list)) + poll_wait(file, &q->done_wq, wait); /* * Take first buffer available for dequeuing. |