aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/indycam.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/indycam.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/indycam.c')
-rw-r--r--drivers/media/video/indycam.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/indycam.c b/drivers/media/video/indycam.c
index bb5cbecffcc3..7420b79e987a 100644
--- a/drivers/media/video/indycam.c
+++ b/drivers/media/video/indycam.c
@@ -289,18 +289,15 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
289 printk(KERN_INFO "SGI IndyCam driver version %s\n", 289 printk(KERN_INFO "SGI IndyCam driver version %s\n",
290 INDYCAM_MODULE_VERSION); 290 INDYCAM_MODULE_VERSION);
291 291
292 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 292 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
293 if (!client) 293 if (!client)
294 return -ENOMEM; 294 return -ENOMEM;
295 camera = kmalloc(sizeof(struct indycam), GFP_KERNEL); 295 camera = kzalloc(sizeof(struct indycam), GFP_KERNEL);
296 if (!camera) { 296 if (!camera) {
297 err = -ENOMEM; 297 err = -ENOMEM;
298 goto out_free_client; 298 goto out_free_client;
299 } 299 }
300 300
301 memset(client, 0, sizeof(struct i2c_client));
302 memset(camera, 0, sizeof(struct indycam));
303
304 client->addr = addr; 301 client->addr = addr;
305 client->adapter = adap; 302 client->adapter = adap;
306 client->driver = &i2c_driver_indycam; 303 client->driver = &i2c_driver_indycam;