---

yaml --- r: 106893 b: refs/heads/master c: 0764bf6 h: refs/heads/master i: 106891: 6371c8c v: v3
git-mirror · Jul 28, 2008 · 157ff69 · 157ff69
1 parent 08c972f
commit 157ff69
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: c713e7cbfa529f87e18bb2eacb2ccdd4ee0ef7d3
+refs/heads/master: 0764bf63da5466474eebf7d21994cf6b106265a3
diff --git a/trunk/arch/powerpc/kernel/vio.c b/trunk/arch/powerpc/kernel/vio.c
@@ -530,7 +530,7 @@ static dma_addr_t vio_dma_iommu_map_single(struct device *dev, void *vaddr,
 	}
 
 	ret = dma_iommu_ops.map_single(dev, vaddr, size, direction, attrs);
-	if (unlikely(dma_mapping_error(ret))) {
+	if (unlikely(dma_mapping_error(dev, ret))) {
 		vio_cmo_dealloc(viodev, roundup(size, IOMMU_PAGE_SIZE));
 		atomic_inc(&viodev->cmo.allocs_failed);
 	}