---

yaml --- r: 72696 b: refs/heads/master c: 5336940 h: refs/heads/master v: v3
git-mirror · Oct 29, 2007 · 99e6e5c · 99e6e5c
1 parent 934fa70
commit 99e6e5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9335432959111c982c74177521305e6a3fb600a3
+refs/heads/master: 5336940dd8b11180a0340ba886db62f728377d19
diff --git a/trunk/arch/x86/kernel/pci-gart_64.c b/trunk/arch/x86/kernel/pci-gart_64.c
@@ -435,7 +435,7 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 
 error:
 	flush_gart();
-	gart_unmap_sg(dev, sg, nents, dir);
+	gart_unmap_sg(dev, sg, out, dir);
 	/* When it was forced or merged try again in a dumb way */
 	if (force_iommu || iommu_merge) {
 		out = dma_map_sg_nonforce(dev, sg, nents, dir);