V4L/DVB: vpif_cap: don't ignore return code of videobuf_poll_stream()
authorMats Randgaard <mats.randgaard@tandberg.com>
Tue, 7 Sep 2010 14:28:23 +0000 (11:28 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:05:50 +0000 (01:05 -0200)
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>
drivers/media/video/davinci/vpif_capture.c

index 2ed233f98a9e7e2cbbab201177dec93087806052..730bd4cf5772a006d0ec5ca5554700180fe72538 100644 (file)
@@ -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;
 }