evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] vivi: let vb2_poll handle events

Browse source 
The vb2_poll function now tests for events and sets POLLPRI accordingly.
So there it is no longer necessary to test for it in the vivi driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.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:28:27 -03:00 • committed by Mauro Carvalho Chehab
parent 95213ceb1b
commit 0bf0f713d6
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/video/vivi.c
View file

@ -1039,17 +1039,10 @@ static unsigned int
vivi_poll(struct file *file, struct poll_table_struct *wait) vivi_poll(struct file *file, struct poll_table_struct *wait)
{ {
struct vivi_dev *dev = video_drvdata(file); struct vivi_dev *dev = video_drvdata(file);
struct v4l2_fh *fh = file->private_data;
struct vb2_queue *q = &dev->vb_vidq; struct vb2_queue *q = &dev->vb_vidq;
unsigned int res;
dprintk(dev, 1, "%s\n", __func__); dprintk(dev, 1, "%s\n", __func__);
res = vb2_poll(q, file, wait); return vb2_poll(q, file, wait);
if (v4l2_event_pending(fh))
res |= POLLPRI;
else
poll_wait(file, &fh->wait, wait);
return res;
} }
static int vivi_close(struct file *file) static int vivi_close(struct file *file)