diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-03 16:08:36 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-03 16:08:36 -0800 |
commit | c031d52cac3fa4b05cf59cd03e9328790f4d4496 (patch) | |
tree | 2eb148d3be46779ea30d221c10c3e67b4e31d9ed /drivers/media/common/saa7146_video.c | |
parent | c1c0cbb8781e4b684a3d902d05b01912b3a545d9 (diff) | |
parent | ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff (diff) |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
saa7146: stop DMA before de-allocating DMA scatter/gather page buffers
V4L/DVB: saa7134: remove stray unlock_kernel
Diffstat (limited to 'drivers/media/common/saa7146_video.c')
-rw-r--r-- | drivers/media/common/saa7146_video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index becbaadb3b7..5ed75263340 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 = { |