|
@@ -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 */
|
|
|
}
|
|
|
|
|
|
|