diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 16:40:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 16:40:56 -0500 |
commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/zr36060.c | |
parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (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/zr36060.c')
-rw-r--r-- | drivers/media/video/zr36060.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zr36060.c b/drivers/media/video/zr36060.c index 129744a07abd..28fa31a5f150 100644 --- a/drivers/media/video/zr36060.c +++ b/drivers/media/video/zr36060.c | |||
@@ -919,12 +919,11 @@ zr36060_setup (struct videocodec *codec) | |||
919 | return -ENOSPC; | 919 | return -ENOSPC; |
920 | } | 920 | } |
921 | //mem structure init | 921 | //mem structure init |
922 | codec->data = ptr = kmalloc(sizeof(struct zr36060), GFP_KERNEL); | 922 | codec->data = ptr = kzalloc(sizeof(struct zr36060), GFP_KERNEL); |
923 | if (NULL == ptr) { | 923 | if (NULL == ptr) { |
924 | dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n"); | 924 | dprintk(1, KERN_ERR "zr36060: Can't get enough memory!\n"); |
925 | return -ENOMEM; | 925 | return -ENOMEM; |
926 | } | 926 | } |
927 | memset(ptr, 0, sizeof(struct zr36060)); | ||
928 | 927 | ||
929 | snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]", | 928 | snprintf(ptr->name, sizeof(ptr->name), "zr36060[%d]", |
930 | zr36060_codecs); | 929 | zr36060_codecs); |