---

yaml --- r: 138134 b: refs/heads/master c: ee9a9d6 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 5691ec3 · 5691ec3
1 parent b6632f0
commit 5691ec3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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