summaryrefslogtreecommitdiff
path: root/drivers/media/video/zoran
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-03-11 02:28:20 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 15:43:17 (GMT)
commitee9a9d661d96e29d93859d20125bc7e4cc75309b (patch)
treeb234c4d7e1c8a442345edbdd30eade28dcd764f3 /drivers/media/video/zoran
parent4dbf46a0485a5b0704e1c4b55a173128fbaedec9 (diff)
downloadlinux-fsl-qoriq-ee9a9d661d96e29d93859d20125bc7e4cc75309b.tar.xz
V4L/DVB (10932): zoran: Don't frighten users with failed buffer allocation
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. Cc: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/zoran')
-rw-r--r--drivers/media/video/zoran/zoran_driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 1869d30..e22378a 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/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