aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa711x.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/saa711x.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/saa711x.c')
-rw-r--r--drivers/media/video/saa711x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index f39a7be08588..ae53063875f9 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -487,20 +487,18 @@ saa711x_detect_client (struct i2c_adapter *adapter,
487 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) 487 if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
488 return 0; 488 return 0;
489 489
490 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 490 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
491 if (client == 0) 491 if (client == 0)
492 return -ENOMEM; 492 return -ENOMEM;
493 memset(client, 0, sizeof(struct i2c_client));
494 client->addr = address; 493 client->addr = address;
495 client->adapter = adapter; 494 client->adapter = adapter;
496 client->driver = &i2c_driver_saa711x; 495 client->driver = &i2c_driver_saa711x;
497 strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client))); 496 strlcpy(I2C_NAME(client), "saa711x", sizeof(I2C_NAME(client)));
498 decoder = kmalloc(sizeof(struct saa711x), GFP_KERNEL); 497 decoder = kzalloc(sizeof(struct saa711x), GFP_KERNEL);
499 if (decoder == NULL) { 498 if (decoder == NULL) {
500 kfree(client); 499 kfree(client);
501 return -ENOMEM; 500 return -ENOMEM;
502 } 501 }
503 memset(decoder, 0, sizeof(struct saa711x));
504 decoder->norm = VIDEO_MODE_NTSC; 502 decoder->norm = VIDEO_MODE_NTSC;
505 decoder->input = 0; 503 decoder->input = 0;
506 decoder->enable = 1; 504 decoder->enable = 1;