---

yaml --- r: 322549 b: refs/heads/master c: b5031ed h: refs/heads/master i: 322547: 65cb6e6 v: v3
git-mirror · Sep 5, 2012 · 778b161 · 778b161
1 parent 6423d98
commit 778b161
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: ce7184bdbd38d920fb515266fbbdc585ad2e5493
+refs/heads/master: b5031ed1be0aa419250557123633453753181643
diff --git a/trunk/drivers/xen/swiotlb-xen.c b/trunk/drivers/xen/swiotlb-xen.c
@@ -232,7 +232,7 @@ xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 		return ret;
 
 	if (hwdev && hwdev->coherent_dma_mask)
-		dma_mask = hwdev->coherent_dma_mask;
+		dma_mask = dma_alloc_coherent_mask(hwdev, flags);
 
 	phys = virt_to_phys(ret);
 	dev_addr = xen_phys_to_bus(phys);