---

yaml --- r: 112574 b: refs/heads/master c: 9dfda12 h: refs/heads/master v: v3
git-mirror · Sep 8, 2008 · 2bc7547 · 2bc7547
1 parent 24f410c
commit 2bc7547
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68e91d61346db4359464d06617500141cfd1442a
+refs/heads/master: 9dfda12b8b769e224ca4efbc35ace4524b9c017b
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
@@ -483,12 +483,9 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 		 * swiotlb_map_single(), which will grab memory from
 		 * the lowest available address range.
 		 */
-		dma_addr_t handle;
-		handle = swiotlb_map_single(NULL, NULL, size, DMA_FROM_DEVICE);
-		if (swiotlb_dma_mapping_error(hwdev, handle))
+		ret = map_single(hwdev, NULL, size, DMA_FROM_DEVICE);
+		if (!ret)
 			return NULL;
-
-		ret = bus_to_virt(handle);
 	}
 
 	memset(ret, 0, size);