summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common/saa7146_video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-05-22 10:30:04 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-05-22 10:30:04 -0300
commit4a78e983d25641804f5c0c83b6c10e51063b7872 (patch)
treece0631476907751234d1d60ee9d1f72e18b30de2 /linux/drivers/media/common/saa7146_video.c
parent2a03de082a1ec685712a48cedb06a73d5d607088 (diff)
parent126b42f75f3d60cf024d206f8d7fb8680903cf8a (diff)
downloadmediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.gz
mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.bz2
merge: http://linuxtv.org/hg/~aapot/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common/saa7146_video.c')
-rw-r--r--linux/drivers/media/common/saa7146_video.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c
index 35288c4bc..d3537ff4f 100644
--- a/linux/drivers/media/common/saa7146_video.c
+++ b/linux/drivers/media/common/saa7146_video.c
@@ -1429,6 +1429,7 @@ static void video_close(struct saa7146_dev *dev, struct file *file)
{
struct saa7146_fh *fh = (struct saa7146_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) {
@@ -1437,6 +1438,11 @@ static void video_close(struct saa7146_dev *dev, struct file *file)
err = saa7146_stop_preview(fh);
}
+ // release all capture buffers
+ mutex_lock(&q->lock);
+ videobuf_read_stop(q);
+ mutex_unlock(&q->lock);
+
/* hmm, why is this function declared void? */
/* return err */
}