From 5691ec36a5b3e3664974bb5bd1561424f4d1dc74 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 10 Mar 2009 23:28:20 -0300
Subject: [PATCH] --- yaml --- r: 138134 b: refs/heads/master c:
 ee9a9d661d96e29d93859d20125bc7e4cc75309b h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/zoran/zoran_driver.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 64047b8dd7f6..4b5a9aeb6aa4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dbf46a0485a5b0704e1c4b55a173128fbaedec9
+refs/heads/master: ee9a9d661d96e29d93859d20125bc7e4cc75309b
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
index 1869d307a59d..e22378a4598b 100644
--- a/trunk/drivers/media/video/zoran/zoran_driver.c
+++ b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -229,7 +229,8 @@ v4l_fbuffer_alloc (struct file *file)
 				ZR_DEVNAME(zr), i);
 
 		//udelay(20);
-		mem = kmalloc(fh->buffers.buffer_size, GFP_KERNEL);
+		mem = kmalloc(fh->buffers.buffer_size,
+			      GFP_KERNEL | __GFP_NOWARN);
 		if (!mem) {
 			dprintk(1,
 				KERN_ERR