Skip to content

Commit

Permalink
V4L/DVB: buf-dma-sg.c: don't assume nr_pages == sglen
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Arnout Vandecappelle authored and Mauro Carvalho Chehab committed May 19, 2010
1 parent c06b062 commit fc7f8fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/media/video/videobuf-dma-sg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit fc7f8fd

Please sign in to comment.