mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 21:38:32 +08:00
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>
This commit is contained in:
parent
c06b062bea
commit
fc7f8fd42c
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user