aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zr36016.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis@issaris.org>2006-01-11 16:40:56 -0500
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-11 16:40:56 -0500
commit7408187d223f63d46a13b6a35b8f96b032c2f623 (patch)
tree425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/zr36016.c
parent0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff)
V4L/DVB (3344a): Conversions from kmalloc+memset to k(z|c)alloc
Conversions from kmalloc+memset to k(z|c)alloc. Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/zr36016.c')
-rw-r--r--drivers/media/video/zr36016.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zr36016.c b/drivers/media/video/zr36016.c
index 4ed898585c70..10130ef67ea7 100644
--- a/drivers/media/video/zr36016.c
+++ b/drivers/media/video/zr36016.c
@@ -451,12 +451,11 @@ zr36016_setup (struct videocodec *codec)
451 return -ENOSPC; 451 return -ENOSPC;
452 } 452 }
453 //mem structure init 453 //mem structure init
454 codec->data = ptr = kmalloc(sizeof(struct zr36016), GFP_KERNEL); 454 codec->data = ptr = kzalloc(sizeof(struct zr36016), GFP_KERNEL);
455 if (NULL == ptr) { 455 if (NULL == ptr) {
456 dprintk(1, KERN_ERR "zr36016: Can't get enough memory!\n"); 456 dprintk(1, KERN_ERR "zr36016: Can't get enough memory!\n");
457 return -ENOMEM; 457 return -ENOMEM;
458 } 458 }
459 memset(ptr, 0, sizeof(struct zr36016));
460 459
461 snprintf(ptr->name, sizeof(ptr->name), "zr36016[%d]", 460 snprintf(ptr->name, sizeof(ptr->name), "zr36016[%d]",
462 zr36016_codecs); 461 zr36016_codecs);