[media] saa7146: fix compiler warning
authorHans Verkuil <hans.verkuil@cisco.com>
Thu, 25 Aug 2011 12:54:30 +0000 (09:54 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 6 Sep 2011 17:40:09 +0000 (14:40 -0300)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/common/saa7146_video.c

index fcdf4a00546d95c694e36c648acc980341dab6c7..384b358d30379dfcdef7a99428bea28c24f7b77f 100644 (file)
@@ -1356,18 +1356,14 @@ static void video_close(struct saa7146_dev *dev, struct file *file)
        struct saa7146_fh *fh = file->private_data;
        struct saa7146_vv *vv = dev->vv_data;
        struct videobuf_queue *q = &fh->video_q;
-       int err;
 
-       if (IS_CAPTURE_ACTIVE(fh) != 0) {
-               err = video_end(fh, file);
-       } else if (IS_OVERLAY_ACTIVE(fh) != 0) {
-               err = saa7146_stop_preview(fh);
-       }
+       if (IS_CAPTURE_ACTIVE(fh) != 0)
+               video_end(fh, file);
+       else if (IS_OVERLAY_ACTIVE(fh) != 0)
+               saa7146_stop_preview(fh);
 
        videobuf_stop(q);
-
        /* hmm, why is this function declared void? */
-       /* return err */
 }