aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zr36050.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/zr36050.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/zr36050.c')
-rw-r--r--drivers/media/video/zr36050.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c
index 0144576a6123..bd0cd28543ca 100644
--- a/drivers/media/video/zr36050.c
+++ b/drivers/media/video/zr36050.c
@@ -813,12 +813,11 @@ zr36050_setup (struct videocodec *codec)
813 return -ENOSPC; 813 return -ENOSPC;
814 } 814 }
815 //mem structure init 815 //mem structure init
816 codec->data = ptr = kmalloc(sizeof(struct zr36050), GFP_KERNEL); 816 codec->data = ptr = kzalloc(sizeof(struct zr36050), GFP_KERNEL);
817 if (NULL == ptr) { 817 if (NULL == ptr) {
818 dprintk(1, KERN_ERR "zr36050: Can't get enough memory!\n"); 818 dprintk(1, KERN_ERR "zr36050: Can't get enough memory!\n");
819 return -ENOMEM; 819 return -ENOMEM;
820 } 820 }
821 memset(ptr, 0, sizeof(struct zr36050));
822 821
823 snprintf(ptr->name, sizeof(ptr->name), "zr36050[%d]", 822 snprintf(ptr->name, sizeof(ptr->name), "zr36050[%d]",
824 zr36050_codecs); 823 zr36050_codecs);