From 0f462a9b08252af937a1873d4e3911bf90a76504 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Wed, 13 Jul 2011 04:28:27 -0300 Subject: [PATCH] --- yaml --- r: 306087 b: refs/heads/master c: 0bf0f713d6e6b9f1c510d598c29ac17812a4eea5 h: refs/heads/master i: 306085: dbf07c5aee8a6e2ab384597d319af1b60686a530 306083: 66a237c2b621ff9b008be6cfdf806ef79b4c5543 306079: 99e5b4209a8e352feff5aad50209f4fc947855b7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 4901d7e81aff..b8b1b40a4188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95213ceb1b527b8102c589bd41fcb7c9163fdd79 +refs/heads/master: 0bf0f713d6e6b9f1c510d598c29ac17812a4eea5 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 5e8b0710105b..b456d3ed1197 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -1039,17 +1039,10 @@ static unsigned int vivi_poll(struct file *file, struct poll_table_struct *wait) { struct vivi_dev *dev = video_drvdata(file); - struct v4l2_fh *fh = file->private_data; struct vb2_queue *q = &dev->vb_vidq; - unsigned int res; dprintk(dev, 1, "%s\n", __func__); - res = vb2_poll(q, file, wait); - if (v4l2_event_pending(fh)) - res |= POLLPRI; - else - poll_wait(file, &fh->wait, wait); - return res; + return vb2_poll(q, file, wait); } static int vivi_close(struct file *file)