diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 13:00:28 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-15 13:00:28 -0200 |
| commit | 491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9 (patch) | |
| tree | e9d75ebe6bef813a17fbd62f25a8ca3dca1e0532 /linux/drivers/media/video/cx88/cx88-blackbird.c | |
| parent | cc59b40aea72b8d3929a89f65fcabb3b9b5746c4 (diff) | |
| parent | 52227110efbe3a7e7b28a0aa7185b126a6d3b9d7 (diff) | |
| download | mediapointer-dvb-s2-491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9.tar.gz mediapointer-dvb-s2-491d2fd7bd092c0938f38d7cef3b1d6e4cbcfbc9.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-blackbird.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-blackbird.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c index 1d729dbde..d9b49275c 100644 --- a/linux/drivers/media/video/cx88/cx88-blackbird.c +++ b/linux/drivers/media/video/cx88/cx88-blackbird.c @@ -1111,10 +1111,7 @@ static int mpeg_release(struct inode *inode, struct file *file) cx8802_cancel_buffers(fh->dev); /* stop mpeg capture */ - if (fh->mpegq.streaming) - videobuf_streamoff(&fh->mpegq); - if (fh->mpegq.reading) - videobuf_read_stop(&fh->mpegq); + videobuf_stop(&fh->mpegq); videobuf_mmap_free(&fh->mpegq); file->private_data = NULL; |