openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] videobuf2: only start streaming in poll() if so requested by the poll mask 

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil 2011-07-13 04:01:30 -03:00 committed by Mauro Carvalho Chehab
parent d0b66fdfd3
commit bf5c7cbb99
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/videobuf2-core.c
View File

@ -1647,6 +1647,7 @@ static int __vb2_cleanup_fileio(struct vb2_queue *q);
*/ */
unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
{ {
unsigned long req_events = poll_requested_events(wait);
unsigned long flags; unsigned long flags;
unsigned int ret; unsigned int ret;
struct vb2_buffer *vb = NULL; struct vb2_buffer *vb = NULL;
@ -1655,12 +1656,14 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
* Start file I/O emulator only if streaming API has not been used yet. * Start file I/O emulator only if streaming API has not been used yet.
*/ */
if (q->num_buffers == 0 && q->fileio == NULL) { if (q->num_buffers == 0 && q->fileio == NULL) {
if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ)) { if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ) &&
(req_events & (POLLIN | POLLRDNORM))) {
ret = __vb2_init_fileio(q, 1); ret = __vb2_init_fileio(q, 1);
if (ret) if (ret)
return POLLERR; return POLLERR;
} }
if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE)) { if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE) &&
(req_events & (POLLOUT | POLLWRNORM))) {
ret = __vb2_init_fileio(q, 0); ret = __vb2_init_fileio(q, 0);
if (ret) if (ret)
return POLLERR; return POLLERR;