diff options
| author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 19:40:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 19:40:56 -0200 |
| commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
| tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/zoran_card.c | |
| parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff) | |
| download | linux-7408187d223f63d46a13b6a35b8f96b032c2f623.tar.gz linux-7408187d223f63d46a13b6a35b8f96b032c2f623.tar.xz | |
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/zoran_card.c')
| -rw-r--r-- | drivers/media/video/zoran_card.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/zoran_card.c b/drivers/media/video/zoran_card.c index 39a0d238900e..ea3288661a34 100644 --- a/drivers/media/video/zoran_card.c +++ b/drivers/media/video/zoran_card.c @@ -1050,7 +1050,7 @@ zr36057_init (struct zoran *zr) /* allocate memory *before* doing anything to the hardware * in case allocation fails */ mem_needed = BUZ_NUM_STAT_COM * 4; - mem = (unsigned long) kmalloc(mem_needed, GFP_KERNEL); + mem = kzalloc(mem_needed, GFP_KERNEL); vdev = (void *) kmalloc(sizeof(struct video_device), GFP_KERNEL); if (!mem || !vdev) { dprintk(1, @@ -1061,7 +1061,6 @@ zr36057_init (struct zoran *zr) kfree((void *)mem); return -ENOMEM; } - memset((void *) mem, 0, mem_needed); zr->stat_com = (u32 *) mem; for (j = 0; j < BUZ_NUM_STAT_COM; j++) { zr->stat_com[j] = 1; /* mark as unavailable to zr36057 */ |