aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7110.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/saa7110.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/saa7110.c')
-rw-r--r--drivers/media/video/saa7110.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 619ff0b7a1f..7bb85a7b326 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -494,21 +494,19 @@ saa7110_detect_client (struct i2c_adapter *adapter,
494 I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA)) 494 I2C_FUNC_SMBUS_READ_BYTE | I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
495 return 0; 495 return 0;
496 496
497 client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); 497 client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
498 if (client == 0) 498 if (client == 0)
499 return -ENOMEM; 499 return -ENOMEM;
500 memset(client, 0, sizeof(struct i2c_client));
501 client->addr = address; 500 client->addr = address;
502 client->adapter = adapter; 501 client->adapter = adapter;
503 client->driver = &i2c_driver_saa7110; 502 client->driver = &i2c_driver_saa7110;
504 strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client))); 503 strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
505 504
506 decoder = kmalloc(sizeof(struct saa7110), GFP_KERNEL); 505 decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);
507 if (decoder == 0) { 506 if (decoder == 0) {
508 kfree(client); 507 kfree(client);
509 return -ENOMEM; 508 return -ENOMEM;
510 } 509 }
511 memset(decoder, 0, sizeof(struct saa7110));
512 decoder->norm = VIDEO_MODE_PAL; 510 decoder->norm = VIDEO_MODE_PAL;
513 decoder->input = 0; 511 decoder->input = 0;
514 decoder->enable = 1; 512 decoder->enable = 1;