diff options
author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 16:40:56 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 16:40:56 -0500 |
commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/saa5246a.c | |
parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (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/saa5246a.c')
-rw-r--r-- | drivers/media/video/saa5246a.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 0aa9e72f632c..2ce010201308 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
@@ -83,13 +83,12 @@ static int saa5246a_attach(struct i2c_adapter *adap, int addr, int kind) | |||
83 | client_template.adapter = adap; | 83 | client_template.adapter = adap; |
84 | client_template.addr = addr; | 84 | client_template.addr = addr; |
85 | memcpy(client, &client_template, sizeof(*client)); | 85 | memcpy(client, &client_template, sizeof(*client)); |
86 | t = kmalloc(sizeof(*t), GFP_KERNEL); | 86 | t = kzalloc(sizeof(*t), GFP_KERNEL); |
87 | if(t==NULL) | 87 | if(t==NULL) |
88 | { | 88 | { |
89 | kfree(client); | 89 | kfree(client); |
90 | return -ENOMEM; | 90 | return -ENOMEM; |
91 | } | 91 | } |
92 | memset(t, 0, sizeof(*t)); | ||
93 | strlcpy(client->name, IF_NAME, I2C_NAME_SIZE); | 92 | strlcpy(client->name, IF_NAME, I2C_NAME_SIZE); |
94 | init_MUTEX(&t->lock); | 93 | init_MUTEX(&t->lock); |
95 | 94 | ||