aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vino.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/vino.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/vino.c')
-rw-r--r--drivers/media/video/vino.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 71b28e9e0850..c8fd8238904d 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4499,13 +4499,11 @@ static int vino_init(void)
4499 dma_addr_t dma_dummy_address; 4499 dma_addr_t dma_dummy_address;
4500 int i; 4500 int i;
4501 4501
4502 vino_drvdata = (struct vino_settings *) 4502 vino_drvdata = kzalloc(sizeof(struct vino_settings), GFP_KERNEL);
4503 kmalloc(sizeof(struct vino_settings), GFP_KERNEL);
4504 if (!vino_drvdata) { 4503 if (!vino_drvdata) {
4505 vino_module_cleanup(vino_init_stage); 4504 vino_module_cleanup(vino_init_stage);
4506 return -ENOMEM; 4505 return -ENOMEM;
4507 } 4506 }
4508 memset(vino_drvdata, 0, sizeof(struct vino_settings));
4509 vino_init_stage++; 4507 vino_init_stage++;
4510 4508
4511 /* create a dummy dma descriptor */ 4509 /* create a dummy dma descriptor */