aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7191.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/saa7191.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/saa7191.c')
-rw-r--r--drivers/media/video/saa7191.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 41f6f05a0436..746cadb8f1c4 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -571,18 +571,15 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
571 printk(KERN_INFO "Philips SAA7191 driver version %s\n", 571 printk(KERN_INFO "Philips SAA7191 driver version %s\n",
572 SAA7191_MODULE_VERSION); 572 SAA7191_MODULE_VERSION);
573 573
574 client = kmalloc(sizeof(*client), GFP_KERNEL); 574 client = kzalloc(sizeof(*client), GFP_KERNEL);
575 if (!client) 575 if (!client)
576 return -ENOMEM; 576 return -ENOMEM;
577 decoder = kmalloc(sizeof(*decoder), GFP_KERNEL); 577 decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
578 if (!decoder) { 578 if (!decoder) {
579 err = -ENOMEM; 579 err = -ENOMEM;
580 goto out_free_client; 580 goto out_free_client;
581 } 581 }
582 582
583 memset(client, 0, sizeof(struct i2c_client));
584 memset(decoder, 0, sizeof(struct saa7191));
585
586 client->addr = addr; 583 client->addr = addr;
587 client->adapter = adap; 584 client->adapter = adap;
588 client->driver = &i2c_driver_saa7191; 585 client->driver = &i2c_driver_saa7191;