Skip to content

Commit

Permalink
[media] saa7146: fix compiler warning
Browse files Browse the repository at this point in the history
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Sep 6, 2011
1 parent eb70ac1 commit 7b4668e
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/media/common/saa7146_video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
}


Expand Down

0 comments on commit 7b4668e

Please sign in to comment.