summaryrefslogtreecommitdiffstats
path: root/drivers/media/common/saa7146_video.c
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-08-25 09:54:30 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-06 14:40:09 -0300
commit7b4668efc4a8f75d12337cf8013307a7ec437878 (patch)
tree7d840c80168ce5d3480d64230a5402677040eac8 /drivers/media/common/saa7146_video.c
parenteb70ac1b1e457537a056cb714ccddbb1fd56f9ed (diff)
downloadop-kernel-dev-7b4668efc4a8f75d12337cf8013307a7ec437878.zip
op-kernel-dev-7b4668efc4a8f75d12337cf8013307a7ec437878.tar.gz
[media] saa7146: fix compiler warning
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r--drivers/media/common/saa7146_video.c12
1 files changed, 4 insertions, 8 deletions
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 */
}
OpenPOWER on IntegriCloud