summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-02-02 00:23:46 +0100
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-02 01:02:03 +0100
commitba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff (patch)
tree911a4e9dea6e28754768f2443a7cedff2fcbb68e /drivers/media
parentV4L/DVB: saa7134: remove stray unlock_kernel (diff)
downloadlinux-ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff.tar.xz
linux-ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff.zip
saa7146: stop DMA before de-allocating DMA scatter/gather page buffers
Thanks-to: Hartmut <e9hack@googlemail.com> for pointing me the problem and testing the fix. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/saa7146_video.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index becbaadb3b77..5ed75263340a 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1333,9 +1333,9 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
DEB_CAP(("vbuf:%p\n",vb));
- release_all_pagetables(dev, buf);
-
saa7146_dma_free(dev,q,buf);
+
+ release_all_pagetables(dev, buf);
}
static struct videobuf_queue_ops video_qops = {