From 507de4137858425f3c52d832fbdf1c81d42f16e0 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Tue, 6 Jan 2009 14:43:10 -0800
Subject: [PATCH] --- yaml --- r: 126419 b: refs/heads/master c:
 58c6d3dfe436eb8cfb451981d8fdc9044eaf42da h: refs/heads/master i:   126417:
 83c2279e6b03b040408c834438ab850788e60f09   126415:
 1e1056c79e13e0db822cc43dc65619db858dac1b v: v3

---
 [refs]                      | 2 +-
 trunk/kernel/dma-coherent.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 57e9316a3042..56ffcbce3081 100644
--- 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
index 8056d081609c..038707404b76 100644
--- 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) {