diff options
| author | Michael Hunold <devnull@localhost> | 2003-12-21 11:28:59 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-12-21 11:28:59 +0000 |
| commit | 28eae47f376c13563c02c2c3a368b20951c45009 (patch) | |
| tree | 2c4a3f8d9d52fc3a8c95af1e4a45b19f98e2a688 /linux/drivers/media/common/saa7146_video.c | |
| parent | a4de0564d8402bd754b5d216376fae86822595c7 (diff) | |
| download | mediapointer-dvb-s2-28eae47f376c13563c02c2c3a368b20951c45009.tar.gz mediapointer-dvb-s2-28eae47f376c13563c02c2c3a368b20951c45009.tar.bz2 | |
- don't disable the capture engine via video_end() before video-buf has
cleared the various capture queue and has shut down capturing
(Thanks Gerd for explaining the pitfalls here!)
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index ab6593c16..9462086c6 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -736,8 +736,6 @@ static int video_end(struct saa7146_fh *fh, struct file *file) vv->streaming = NULL; - videobuf_queue_cancel(file,&fh->video_q); - spin_unlock_irqrestore(&dev->slock, flags); return 0; @@ -1104,8 +1102,8 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int int *type = arg; DEB_D(("VIDIOC_STREAMOFF, type:%d\n",*type)); - video_end(fh, file); err = videobuf_streamoff(file,q); + video_end(fh, file); return err; } case VIDIOCGMBUF: |