From 9697f0dbe0c5f17ebbf33ea855fb5b3fe2c3fa43 Mon Sep 17 00:00:00 2001 From: Pawel Osciak Date: Mon, 22 Feb 2010 13:10:06 -0300 Subject: [PATCH] --- yaml --- r: 181714 b: refs/heads/master c: bee527f97963ece5e3f6e6587402197af889865b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-sg.c | 2 ++ trunk/drivers/media/video/videobuf-vmalloc.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 70a414a303c4..e24e1ea36d65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cca80b973244cf7cf721b05b33178ba4826dbc5e +refs/heads/master: bee527f97963ece5e3f6e6587402197af889865b diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c index fa78555b118b..fcd045e7a1c1 100644 --- a/trunk/drivers/media/video/videobuf-dma-sg.c +++ b/trunk/drivers/media/video/videobuf-dma-sg.c @@ -418,6 +418,8 @@ static void *__videobuf_alloc(size_t size) struct videobuf_buffer *vb; vb = kzalloc(size+sizeof(*mem),GFP_KERNEL); + if (!vb) + return vb; mem = vb->priv = ((char *)vb)+size; mem->magic=MAGIC_SG_MEM; diff --git a/trunk/drivers/media/video/videobuf-vmalloc.c b/trunk/drivers/media/video/videobuf-vmalloc.c index d6e6a28fb6b8..136e09383c06 100644 --- a/trunk/drivers/media/video/videobuf-vmalloc.c +++ b/trunk/drivers/media/video/videobuf-vmalloc.c @@ -138,6 +138,8 @@ static void *__videobuf_alloc(size_t size) struct videobuf_buffer *vb; vb = kzalloc(size+sizeof(*mem),GFP_KERNEL); + if (!vb) + return vb; mem = vb->priv = ((char *)vb)+size; mem->magic=MAGIC_VMAL_MEM;