aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7114.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/saa7114.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/saa7114.c')
-rw-r--r--drivers/media/video/saa7114.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index b7ac0122f729..fd0a4b4ef014 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -852,21 +852,19 @@ saa7114_detect_client (struct i2c_adapter *adapter,
852 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) 852 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
853 return 0; 853 return 0;
854 854
855 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 855 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
856 if (client == 0) 856 if (client == 0)
857 return -ENOMEM; 857 return -ENOMEM;
858 memset(client, 0, sizeof(struct i2c_client));
859 client->addr = address; 858 client->addr = address;
860 client->adapter = adapter; 859 client->adapter = adapter;
861 client->driver = &i2c_driver_saa7114; 860 client->driver = &i2c_driver_saa7114;
862 strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client))); 861 strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client)));
863 862
864 decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL); 863 decoder = kzalloc(sizeof(struct saa7114), GFP_KERNEL);
865 if (decoder == NULL) { 864 if (decoder == NULL) {
866 kfree(client); 865 kfree(client);
867 return -ENOMEM; 866 return -ENOMEM;
868 } 867 }
869 memset(decoder, 0, sizeof(struct saa7114));
870 decoder->norm = VIDEO_MODE_NTSC; 868 decoder->norm = VIDEO_MODE_NTSC;
871 decoder->input = -1; 869 decoder->input = -1;
872 decoder->enable = 1; 870 decoder->enable = 1;