---

yaml --- r: 306087 b: refs/heads/master c: 0bf0f71 h: refs/heads/master i: 306085: dbf07c5 306083: 66a237c 306079: 99e5b42 v: v3
git-mirror · Mar 27, 2012 · 0f462a9 · 0f462a9
1 parent 152f2a5
commit 0f462a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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)