---

yaml --- r: 126419 b: refs/heads/master c: 58c6d3d h: refs/heads/master i: 126417: 83c2279 126415: 1e1056c v: v3
git-mirror · Jan 6, 2009 · 507de41 · 507de41
1 parent 79f1d6f
commit 507de41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eccd83e116e7f414a1da3aae3745384b7b171883
+refs/heads/master: 58c6d3dfe436eb8cfb451981d8fdc9044eaf42da
diff --git a/trunk/kernel/dma-coherent.c b/trunk/kernel/dma-coherent.c
@@ -118,6 +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;
 
 	pageno = bitmap_find_free_region(mem->bitmap, mem->size, order);
 	if (pageno >= 0) {