diff options
author | Brandon Philips <brandon@ifup.org> | 2007-11-13 18:11:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-11 15:08:09 -0500 |
commit | 053fcb6014eef31c2674d344c704118e0ac229ef (patch) | |
tree | 8d0ea0b5b7d60081f16756d7c92a8df4c0e0c531 /drivers/media/video/saa7134/saa7134-empress.c | |
parent | 19bc5133dae9562e8824ef101464061f9854c1d8 (diff) |
V4L/DVB (6602): V4L: Convert videobuf drivers to videobuf_stop
Drivers were using cookie cutter code for stopping the read/stream. Use the
new videobuf_stop function which is lock safe.
Signed-off-by: Brandon Philips <bphilips@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 75d0c5bf46d2..9322f44865b8 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -110,11 +110,8 @@ static int ts_release(struct inode *inode, struct file *file) | |||
110 | { | 110 | { |
111 | struct saa7134_dev *dev = file->private_data; | 111 | struct saa7134_dev *dev = file->private_data; |
112 | 112 | ||
113 | if (dev->empress_tsq.streaming) | ||
114 | videobuf_streamoff(&dev->empress_tsq); | ||
115 | mutex_lock(&dev->empress_tsq.lock); | 113 | mutex_lock(&dev->empress_tsq.lock); |
116 | if (dev->empress_tsq.reading) | 114 | videobuf_stop(&dev->empress_tsq); |
117 | videobuf_read_stop(&dev->empress_tsq); | ||
118 | videobuf_mmap_free(&dev->empress_tsq); | 115 | videobuf_mmap_free(&dev->empress_tsq); |
119 | dev->empress_users--; | 116 | dev->empress_users--; |
120 | 117 | ||