aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840
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/cx25840
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/cx25840')
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index d45237d508c4..c1734762436d 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -862,11 +862,10 @@ static int cx25840_detect_client(struct i2c_adapter *adapter, int address,
862 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) 862 if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
863 return 0; 863 return 0;
864 864
865 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 865 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
866 if (client == 0) 866 if (client == 0)
867 return -ENOMEM; 867 return -ENOMEM;
868 868
869 memset(client, 0, sizeof(struct i2c_client));
870 client->addr = address; 869 client->addr = address;
871 client->adapter = adapter; 870 client->adapter = adapter;
872 client->driver = &i2c_driver_cx25840; 871 client->driver = &i2c_driver_cx25840;