diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-01-20 19:15:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 16:33:53 -0400 |
commit | 94f3f48f90f77e3bfcafce9b259086cfebcd166d (patch) | |
tree | 126519e5c826eb08e1949544abbb5667e2a49854 /drivers | |
parent | 1f69fd970dfdd9872c83f62864b2557d686948cb (diff) |
[media] omap_vout: Add poll() support
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/omap/omap_vout.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 30d8896bb710..9c5c19f142de 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
@@ -833,6 +833,15 @@ static void omap_vout_buffer_release(struct videobuf_queue *q, | |||
833 | /* | 833 | /* |
834 | * File operations | 834 | * File operations |
835 | */ | 835 | */ |
836 | static unsigned int omap_vout_poll(struct file *file, | ||
837 | struct poll_table_struct *wait) | ||
838 | { | ||
839 | struct omap_vout_device *vout = file->private_data; | ||
840 | struct videobuf_queue *q = &vout->vbq; | ||
841 | |||
842 | return videobuf_poll_stream(file, q, wait); | ||
843 | } | ||
844 | |||
836 | static void omap_vout_vm_open(struct vm_area_struct *vma) | 845 | static void omap_vout_vm_open(struct vm_area_struct *vma) |
837 | { | 846 | { |
838 | struct omap_vout_device *vout = vma->vm_private_data; | 847 | struct omap_vout_device *vout = vma->vm_private_data; |
@@ -1861,6 +1870,7 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = { | |||
1861 | 1870 | ||
1862 | static const struct v4l2_file_operations omap_vout_fops = { | 1871 | static const struct v4l2_file_operations omap_vout_fops = { |
1863 | .owner = THIS_MODULE, | 1872 | .owner = THIS_MODULE, |
1873 | .poll = omap_vout_poll, | ||
1864 | .unlocked_ioctl = video_ioctl2, | 1874 | .unlocked_ioctl = video_ioctl2, |
1865 | .mmap = omap_vout_mmap, | 1875 | .mmap = omap_vout_mmap, |
1866 | .open = omap_vout_open, | 1876 | .open = omap_vout_open, |