git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (7854): cx18/ivtv: improve and fix out-of-memory handling
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
cx18
/
cx18-queue.c
diff --git
a/drivers/media/video/cx18/cx18-queue.c
b/drivers/media/video/cx18/cx18-queue.c
index
65af1bb
..
4ef6996
100644
(file)
--- a/
drivers/media/video/cx18/cx18-queue.c
+++ b/
drivers/media/video/cx18/cx18-queue.c
@@
-239,12
+239,12
@@
int cx18_stream_alloc(struct cx18_stream *s)
/* allocate stream buffers. Initially all buffers are in q_free. */
for (i = 0; i < s->buffers; i++) {
/* allocate stream buffers. Initially all buffers are in q_free. */
for (i = 0; i < s->buffers; i++) {
- struct cx18_buffer *buf =
-
kzalloc(sizeof(struct cx18_buffer), GFP_KERNEL
);
+ struct cx18_buffer *buf =
kzalloc(sizeof(struct cx18_buffer),
+
GFP_KERNEL|__GFP_NOWARN
);
if (buf == NULL)
break;
if (buf == NULL)
break;
- buf->buf = kmalloc(s->buf_size, GFP_KERNEL);
+ buf->buf = kmalloc(s->buf_size, GFP_KERNEL
|__GFP_NOWARN
);
if (buf->buf == NULL) {
kfree(buf);
break;
if (buf->buf == NULL) {
kfree(buf);
break;