diff options
| author | Mats Randgaard <mats.randgaard@tandberg.com> | 2010-09-07 11:28:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:05:50 -0200 |
| commit | 11382f3d8a2d54d1db0aa6a768cd94214536c1b2 (patch) | |
| tree | cf711ae067b1a08b69dc0ffe3c425d85273968e9 /drivers/media/video/davinci | |
| parent | 1f8766b4e3f06c2206e7ff48da72d2886672759a (diff) | |
| download | blackbird-op-linux-11382f3d8a2d54d1db0aa6a768cd94214536c1b2.tar.gz blackbird-op-linux-11382f3d8a2d54d1db0aa6a768cd94214536c1b2.zip | |
V4L/DVB: vpif_cap: don't ignore return code of videobuf_poll_stream()
Signed-off-by: Mats Randgaard <mats.randgaard@tandberg.com>
Signed-off-by: Hans Verkuil <hans.verkuil@tandberg.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci')
| -rw-r--r-- | drivers/media/video/davinci/vpif_capture.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index 2ed233f98a9e..730bd4cf5772 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/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; } |
