From 6b31853ec742128b7ade6578b6761529b4d2f62b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 27 Aug 2007 07:37:34 -0300 Subject: [PATCH] --- yaml --- r: 65923 b: refs/heads/master c: 40558dafff257d69248af8b96c7e896f6bc79dfa h: refs/heads/master i: 65921: 59a7725da58e83d8422e5bfec46c5eccfc9b763d 65919: 03f4bdcbacc7cc44736d1a1c9a7ff9e5491dbd00 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) 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 ||