---

yaml --- r: 252968 b: refs/heads/master c: c681d0b h: refs/heads/master v: v3
git-mirror · Jun 1, 2011 · 7d9b976 · 7d9b976
1 parent 7f75740
commit 7d9b976
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb
+refs/heads/master: c681d0ba1252954208220ad32248a3e8e2fc98e4
diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c
@@ -2732,8 +2732,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
 	iommu = domain_get_iommu(domain);
 	size = aligned_nrpages(paddr, size);
 
-	iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size),
-				pdev->dma_mask);
+	iova = intel_alloc_iova(hwdev, domain, dma_to_mm_pfn(size), dma_mask);
 	if (!iova)
 		goto error;