diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-08-25 16:54:30 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 21:40:09 +0400 |
| commit | 7b4668efc4a8f75d12337cf8013307a7ec437878 (patch) | |
| tree | 7d840c80168ce5d3480d64230a5402677040eac8 /drivers/media/common | |
| parent | eb70ac1b1e457537a056cb714ccddbb1fd56f9ed (diff) | |
| download | linux-7b4668efc4a8f75d12337cf8013307a7ec437878.tar.xz | |
[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')
| -rw-r--r-- | drivers/media/common/saa7146_video.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index fcdf4a00546d..384b358d3037 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 */ } |