Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / media / common / saa7146_video.c

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index fcdf4a0..ce30533 100644 (file)
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -2,6 +2,7 @@
 
 #include <media/saa7146_vv.h>
 #include <media/v4l2-chip-ident.h>
+#include <linux/module.h>
 
 static int max_memory = 32;
 
@@ -1356,18 +1357,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 */
 }