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/saa7111.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/saa7111.c')
-rw-r--r-- | drivers/media/video/saa7111.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c index acaeee592b54..8c06592b37ff 100644 --- a/drivers/media/video/saa7111.c +++ b/drivers/media/video/saa7111.c | |||
@@ -511,21 +511,19 @@ saa7111_detect_client (struct i2c_adapter *adapter, | |||
511 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 511 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
512 | return 0; | 512 | return 0; |
513 | 513 | ||
514 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 514 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
515 | if (client == 0) | 515 | if (client == 0) |
516 | return -ENOMEM; | 516 | return -ENOMEM; |
517 | memset(client, 0, sizeof(struct i2c_client)); | ||
518 | client->addr = address; | 517 | client->addr = address; |
519 | client->adapter = adapter; | 518 | client->adapter = adapter; |
520 | client->driver = &i2c_driver_saa7111; | 519 | client->driver = &i2c_driver_saa7111; |
521 | strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client))); | 520 | strlcpy(I2C_NAME(client), "saa7111", sizeof(I2C_NAME(client))); |
522 | 521 | ||
523 | decoder = kmalloc(sizeof(struct saa7111), GFP_KERNEL); | 522 | decoder = kzalloc(sizeof(struct saa7111), GFP_KERNEL); |
524 | if (decoder == NULL) { | 523 | if (decoder == NULL) { |
525 | kfree(client); | 524 | kfree(client); |
526 | return -ENOMEM; | 525 | return -ENOMEM; |
527 | } | 526 | } |
528 | memset(decoder, 0, sizeof(struct saa7111)); | ||
529 | decoder->norm = VIDEO_MODE_NTSC; | 527 | decoder->norm = VIDEO_MODE_NTSC; |
530 | decoder->input = 0; | 528 | decoder->input = 0; |
531 | decoder->enable = 1; | 529 | decoder->enable = 1; |