aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tvp5150.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/tvp5150.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/tvp5150.c')
-rw-r--r--drivers/media/video/tvp5150.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index c35b8042eee5..e86b522938fd 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -1074,12 +1074,11 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
1074 return -ENOMEM; 1074 return -ENOMEM;
1075 memcpy(c, &client_template, sizeof(struct i2c_client)); 1075 memcpy(c, &client_template, sizeof(struct i2c_client));
1076 1076
1077 core = kmalloc(sizeof(struct tvp5150), GFP_KERNEL); 1077 core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL);
1078 if (core == 0) { 1078 if (core == 0) {
1079 kfree(c); 1079 kfree(c);
1080 return -ENOMEM; 1080 return -ENOMEM;
1081 } 1081 }
1082 memset(core, 0, sizeof(struct tvp5150));
1083 i2c_set_clientdata(c, core); 1082 i2c_set_clientdata(c, core);
1084 1083
1085 rv = i2c_attach_client(c); 1084 rv = i2c_attach_client(c);