---

yaml --- r: 219089 b: refs/heads/master c: 11382f3 h: refs/heads/master i: 219087: dd5d0c5 v: v3
git-mirror · Oct 21, 2010 · 88dd2f2 · 88dd2f2
1 parent 2f1e54e
commit 88dd2f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f8766b4e3f06c2206e7ff48da72d2886672759a
+refs/heads/master: 11382f3d8a2d54d1db0aa6a768cd94214536c1b2
diff --git a/trunk/drivers/media/video/davinci/vpif_capture.c b/trunk/drivers/media/video/davinci/vpif_capture.c
@@ -731,16 +731,14 @@ static int vpif_mmap(struct file *filep, struct vm_area_struct *vma)
  */
 static unsigned int vpif_poll(struct file *filep, poll_table * wait)
 {
-	int err = 0;
 	struct vpif_fh *fh = filep->private_data;
 	struct channel_obj *channel = fh->channel;
 	struct common_obj *common = &(channel->common[VPIF_VIDEO_INDEX]);
 
 	vpif_dbg(2, debug, "vpif_poll\n");
 
 	if (common->started)
-		err = videobuf_poll_stream(filep, &common->buffer_queue, wait);
-
+		return videobuf_poll_stream(filep, &common->buffer_queue, wait);
 	return 0;
 }