aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-01-16 13:34:39 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-06-02 12:00:06 +0200
commit35a3a02f1a85129e1df015a79197321302b15d64 (patch)
tree3a887aee8ea380cff161d064f9c3c8b7745f4285
parent12a74f75166c58f745aca159bd0387b6e42620bc (diff)
saa7146: fix epoll
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--drivers/media/common/saa7146/saa7146_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index be4f80a40214..90fcb7dd6596 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -331,6 +331,7 @@ static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)
DEB_EE("file:%p, poll:%p\n", file, wait);
+ poll_wait(file, &buf->done, wait);
if (vdev->vfl_type == VFL_TYPE_VBI) {
if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)
return res | EPOLLOUT | EPOLLWRNORM;
@@ -350,7 +351,6 @@ static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)
return res | EPOLLERR;
}
- poll_wait(file, &buf->done, wait);
if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {
DEB_D("poll succeeded!\n");
return res | EPOLLIN | EPOLLRDNORM;

Privacy Policy