From f8055effec4fd003b1f22ea802a54ba40fafdfed Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 17 Mar 2010 19:53:04 -0300 Subject: [PATCH] --- yaml --- r: 193100 b: refs/heads/master c: fc7f8fd42c2b934ac348995e0c530c917fc277d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-sg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7fcfb1a115d0..510120bd0ef2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c06b062bea411f616b0890d502044c7871d5332f +refs/heads/master: fc7f8fd42c2b934ac348995e0c530c917fc277d5 diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c index b49f1e23298a..8359e6badd36 100644 --- a/trunk/drivers/media/video/videobuf-dma-sg.c +++ b/trunk/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; }