From ec0037623af7f353ed042ae8b81a1758819ef4f6 Mon Sep 17 00:00:00 2001 From: Pierrick Hascoet Date: Mon, 18 Mar 2013 17:04:45 +0100 Subject: [PATCH] --- yaml --- r: 361943 b: refs/heads/master c: 2105fd550ca7dbdd490934f487852c2a399b20cf h: refs/heads/master i: 361941: 71bba224469ff461264a16c2ab51e37b9dc26349 361939: 9dd98435c3a0c7c08c674e78137d132a9cee6055 361935: e35bda523d6d782b6138ae5c7e714f659c8ad87d v: v3 --- [refs] | 2 +- trunk/arch/arc/include/asm/dma-mapping.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7d3e4592271f..53bb37d4e414 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a37b2dc52b88ccd926099d852eae1bb324bc92eb +refs/heads/master: 2105fd550ca7dbdd490934f487852c2a399b20cf diff --git a/trunk/arch/arc/include/asm/dma-mapping.h b/trunk/arch/arc/include/asm/dma-mapping.h index 31f77aec0823..45b8e0cea176 100644 --- a/trunk/arch/arc/include/asm/dma-mapping.h +++ b/trunk/arch/arc/include/asm/dma-mapping.h @@ -126,7 +126,7 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int i; for_each_sg(sg, s, nents, i) - sg->dma_address = dma_map_page(dev, sg_page(s), s->offset, + s->dma_address = dma_map_page(dev, sg_page(s), s->offset, s->length, dir); return nents;