summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorArnout Vandecappelle <arnout@mind.be>2010-03-17 19:53:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:58:40 -0300
commitfc7f8fd42c2b934ac348995e0c530c917fc277d5 (patch)
treed83e4e80cbf38e3a64f1c6d32347e50535b0778a /drivers/media
parentc06b062bea411f616b0890d502044c7871d5332f (diff)
downloadop-kernel-dev-fc7f8fd42c2b934ac348995e0c530c917fc277d5.zip
op-kernel-dev-fc7f8fd42c2b934ac348995e0c530c917fc277d5.tar.gz
V4L/DVB: buf-dma-sg.c: don't assume nr_pages == sglen
videobuf_pages_to_sg() and videobuf_vmalloc_to_sg() happen to create a scatterlist element for every page. However, this is not true for bus addresses, so other functions shouldn't rely on the length of the scatter list being equal to nr_pages. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/videobuf-dma-sg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
index b49f1e2..8359e6b 100644
--- a/drivers/media/video/videobuf-dma-sg.c
+++ b/drivers/media/video/videobuf-dma-sg.c
@@ -286,7 +286,7 @@ int videobuf_dma_unmap(struct videobuf_queue *q, struct videobuf_dmabuf *dma)
if (!dma->sglen)
return 0;
- dma_unmap_sg(q->dev, dma->sglist, dma->nr_pages, dma->direction);
+ dma_unmap_sg(q->dev, dma->sglist, dma->sglen, dma->direction);
vfree(dma->sglist);
dma->sglist = NULL;
@@ -537,7 +537,7 @@ static int __videobuf_sync(struct videobuf_queue *q,
MAGIC_CHECK(mem->dma.magic, MAGIC_DMABUF);
dma_sync_sg_for_cpu(q->dev, mem->dma.sglist,
- mem->dma.nr_pages, mem->dma.direction);
+ mem->dma.sglen, mem->dma.direction);
return 0;
}
OpenPOWER on IntegriCloud