From: Jean Delvare Date: Wed, 11 Mar 2009 02:28:20 +0000 (-0300) Subject: V4L/DVB (10932): zoran: Don't frighten users with failed buffer allocation X-Git-Tag: MMI-PSA29.97-13-9~29189^2~265 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee9a9d661d96e29d93859d20125bc7e4cc75309b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Jean Delvare Signed-off-by: Trent Piepho Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c index 1869d307a59d..e22378a4598b 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