aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tveeprom.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/tveeprom.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/tveeprom.c')
-rw-r--r--drivers/media/video/tveeprom.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index fd0acc5da667..5e71a354e879 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -719,8 +719,7 @@ tveeprom_command(struct i2c_client *client,
719 719
720 switch (cmd) { 720 switch (cmd) {
721 case 0: 721 case 0:
722 buf = kmalloc(256,GFP_KERNEL); 722 buf = kzalloc(256,GFP_KERNEL);
723 memset(buf,0,256);
724 tveeprom_read(client,buf,256); 723 tveeprom_read(client,buf,256);
725 tveeprom_hauppauge_analog(client, &eeprom,buf); 724 tveeprom_hauppauge_analog(client, &eeprom,buf);
726 kfree(buf); 725 kfree(buf);
@@ -743,10 +742,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
743{ 742{
744 struct i2c_client *client; 743 struct i2c_client *client;
745 744
746 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 745 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
747 if (NULL == client) 746 if (NULL == client)
748 return -ENOMEM; 747 return -ENOMEM;
749 memset(client, 0, sizeof(struct i2c_client));
750 client->addr = address; 748 client->addr = address;
751 client->adapter = adapter; 749 client->adapter = adapter;
752 client->driver = &i2c_driver_tveeprom; 750 client->driver = &i2c_driver_tveeprom;