From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Thu, 25 Aug 2011 12:54:30 +0000 (-0300)
Subject: [media] saa7146: fix compiler warning
X-Git-Tag: v3.2-rc1~112^2~234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7b4668efc4a8f75d12337cf8013307a7ec437878;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

[media] saa7146: fix compiler warning

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index fcdf4a0..384b358 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -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 */
 }