diff --git a/[refs] b/[refs]
index 2d760dce8ff6..e0772112e92a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba366a23b68029fc8560acf1ad8735eed910f962
+refs/heads/master: 40558dafff257d69248af8b96c7e896f6bc79dfa
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
index c14e2b3e4241..01c977671311 100644
--- a/trunk/drivers/media/video/vivi.c
+++ b/trunk/drivers/media/video/vivi.c
@@ -1122,9 +1122,8 @@ vivi_poll(struct file *file, struct poll_table_struct *wait)
 	} else {
 		dprintk(1,"poll: read() interface\n");
 		/* read() capture */
-		buf = (struct vivi_buffer*)fh->vb_vidq.read_buf;
-		if (NULL == buf)
-			return POLLERR;
+		return videobuf_poll_stream(file, &fh->	vb_vidq,
+					    wait);
 	}
 	poll_wait(file, &buf->vb.done, wait);
 	if (buf->vb.state == STATE_DONE ||