diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-03-11 03:28:20 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 17:43:17 +0200 |
| commit | ee9a9d661d96e29d93859d20125bc7e4cc75309b (patch) | |
| tree | b234c4d7e1c8a442345edbdd30eade28dcd764f3 | |
| parent | V4L/DVB (10931): zoran: Drop the lock_norm module parameter (diff) | |
| download | linux-ee9a9d661d96e29d93859d20125bc7e4cc75309b.tar.xz linux-ee9a9d661d96e29d93859d20125bc7e4cc75309b.zip | |
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>
| -rw-r--r-- | drivers/media/video/zoran/zoran_driver.c | 3 |
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 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 |