summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2009-03-10 19:28:20 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2009-03-10 19:28:20 -0700
commit8fb8df7555475d10ef8154ef9aa81835c093c1b6 (patch)
treeaead41005b5a846148e6942864e81239805f294b /linux
parent402f9ceab8607e246c388e640cc657e9b5be0286 (diff)
downloadmediapointer-dvb-s2-8fb8df7555475d10ef8154ef9aa81835c093c1b6.tar.gz
mediapointer-dvb-s2-8fb8df7555475d10ef8154ef9aa81835c093c1b6.tar.bz2
zoran: Don't frighten users with failed buffer allocation
From: Jean Delvare <khali@linux-fr.org> kmalloc() can fail for large video buffers. By default the kernel complains loudly about allocation failures, but we don't want to frighten the user, so ask kmalloc() to keep quiet on such failures. Priority: normal Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Cc: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/zoran/zoran_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/video/zoran/zoran_driver.c b/linux/drivers/media/video/zoran/zoran_driver.c
index 97e1c776b..7fcd43160 100644
--- a/linux/drivers/media/video/zoran/zoran_driver.c
+++ b/linux/drivers/media/video/zoran/zoran_driver.c
@@ -230,7 +230,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