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/adv7175.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/adv7175.c')
-rw-r--r-- | drivers/media/video/adv7175.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index 6d9536a71ee..4e218f22b21 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
@@ -463,10 +463,9 @@ adv7175_detect_client (struct i2c_adapter *adapter, | |||
463 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 463 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
464 | return 0; | 464 | return 0; |
465 | 465 | ||
466 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 466 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
467 | if (client == 0) | 467 | if (client == 0) |
468 | return -ENOMEM; | 468 | return -ENOMEM; |
469 | memset(client, 0, sizeof(struct i2c_client)); | ||
470 | client->addr = address; | 469 | client->addr = address; |
471 | client->adapter = adapter; | 470 | client->adapter = adapter; |
472 | client->driver = &i2c_driver_adv7175; | 471 | client->driver = &i2c_driver_adv7175; |
@@ -483,12 +482,11 @@ adv7175_detect_client (struct i2c_adapter *adapter, | |||
483 | } | 482 | } |
484 | strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); | 483 | strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); |
485 | 484 | ||
486 | encoder = kmalloc(sizeof(struct adv7175), GFP_KERNEL); | 485 | encoder = kzalloc(sizeof(struct adv7175), GFP_KERNEL); |
487 | if (encoder == NULL) { | 486 | if (encoder == NULL) { |
488 | kfree(client); | 487 | kfree(client); |
489 | return -ENOMEM; | 488 | return -ENOMEM; |
490 | } | 489 | } |
491 | memset(encoder, 0, sizeof(struct adv7175)); | ||
492 | encoder->norm = VIDEO_MODE_PAL; | 490 | encoder->norm = VIDEO_MODE_PAL; |
493 | encoder->input = 0; | 491 | encoder->input = 0; |
494 | encoder->enable = 1; | 492 | encoder->enable = 1; |