---

yaml --- r: 72199 b: refs/heads/master c: cb92ae8 h: refs/heads/master i: 72197: a0e2261 72195: fe9cfc3 72191: 8b96984 v: v3
git-mirror · Oct 23, 2007 · 474ba85 · 474ba85
1 parent 4df7572
commit 474ba85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83fcaf70403ce04c693b52e62c794834b9a86089
+refs/heads/master: cb92ae81509eb5ddaea53884b60437502c837405
diff --git a/trunk/arch/sparc64/kernel/iommu_common.c b/trunk/arch/sparc64/kernel/iommu_common.c
@@ -233,6 +233,11 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)
 	dma_sg->dma_address = dent_addr;
 	dma_sg->dma_length = dent_len;
 
+	if (dma_sg != sg) {
+		dma_sg = next_sg(dma_sg);
+		dma_sg->dma_length = 0;
+	}
+
 	return ((unsigned long) dent_addr +
 		(unsigned long) dent_len +
 		(IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;