diff options
author | Hartmut Birr <e9hack@gmail.com> | 2007-04-22 06:57:26 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-04-27 15:45:48 -0300 |
commit | 2970c49270be2a62b1115f73bbfc0b8d3b3f48ba (patch) | |
tree | ac7be9756a51567c6c16bb65d644f2d2b8ff7825 /drivers/media/common/saa7146_video.c | |
parent | dc120b0734fcc6a4c42c73790a02f2fa74a7a326 (diff) | |
download | linux-2970c49270be2a62b1115f73bbfc0b8d3b3f48ba.tar.gz linux-2970c49270be2a62b1115f73bbfc0b8d3b3f48ba.tar.bz2 linux-2970c49270be2a62b1115f73bbfc0b8d3b3f48ba.zip |
V4L/DVB (5545): Saa7146: Release capture buffers on device close
If the video device (saa7146 on a FF card) was open for capturing,
the close call didn't release the capture buffers.
Signed-off-by: Hartmut Birr <e9hack@gmail.com>
Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 7e0cedc557df..e3d04a4cef4d 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c @@ -1428,6 +1428,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) { @@ -1436,6 +1437,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 */ } |