---

yaml --- r: 130057 b: refs/heads/master c: cdf57ca h: refs/heads/master i: 130055: b843849 v: v3
git-mirror · Jan 21, 2009 · fb6fb5b · fb6fb5b
1 parent 91202cf
commit fb6fb5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2afb447f33c29cb000a494396559f8005d3e33c1
+refs/heads/master: cdf57cab27aef72f13a19c86858c6cac9951dc24
diff --git a/trunk/kernel/dma-coherent.c b/trunk/kernel/dma-coherent.c
@@ -118,8 +118,8 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
 	mem = dev->dma_mem;
 	if (!mem)
 		return 0;
-	if (unlikely(size > mem->size))
- 		return 0;
+	if (unlikely(size > (mem->size << PAGE_SHIFT)))
+		return 0;
 
 	pageno = bitmap_find_free_region(mem->bitmap, mem->size, order);
 	if (pageno >= 0) {