From 88dd2f2729469826abbbda591d21036d43af6cdb Mon Sep 17 00:00:00 2001 From: Mats Randgaard Date: Tue, 7 Sep 2010 11:28:23 -0300 Subject: [PATCH] --- yaml --- r: 219089 b: refs/heads/master c: 11382f3d8a2d54d1db0aa6a768cd94214536c1b2 h: refs/heads/master i: 219087: dd5d0c5e8397e6258a042ee9cb49dae51b34afec v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/vpif_capture.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 056a1ab30966..ff8633c13353 100644 --- 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 index 2ed233f98a9e..730bd4cf5772 100644 --- a/trunk/drivers/media/video/davinci/vpif_capture.c +++ b/trunk/drivers/media/video/davinci/vpif_capture.c @@ -731,7 +731,6 @@ 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]); @@ -739,8 +738,7 @@ static unsigned int vpif_poll(struct file *filep, poll_table * wait) 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; }