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/adv7170.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/adv7170.c')
-rw-r--r-- | drivers/media/video/adv7170.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index e61003de1d5f..4ce07ae62dac 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
@@ -413,10 +413,9 @@ adv7170_detect_client (struct i2c_adapter *adapter, | |||
413 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) | 413 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) |
414 | return 0; | 414 | return 0; |
415 | 415 | ||
416 | client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); | 416 | client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); |
417 | if (client == 0) | 417 | if (client == 0) |
418 | return -ENOMEM; | 418 | return -ENOMEM; |
419 | memset(client, 0, sizeof(struct i2c_client)); | ||
420 | client->addr = address; | 419 | client->addr = address; |
421 | client->adapter = adapter; | 420 | client->adapter = adapter; |
422 | client->driver = &i2c_driver_adv7170; | 421 | client->driver = &i2c_driver_adv7170; |
@@ -433,12 +432,11 @@ adv7170_detect_client (struct i2c_adapter *adapter, | |||
433 | } | 432 | } |
434 | strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); | 433 | strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client))); |
435 | 434 | ||
436 | encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL); | 435 | encoder = kzalloc(sizeof(struct adv7170), GFP_KERNEL); |
437 | if (encoder == NULL) { | 436 | if (encoder == NULL) { |
438 | kfree(client); | 437 | kfree(client); |
439 | return -ENOMEM; | 438 | return -ENOMEM; |
440 | } | 439 | } |
441 | memset(encoder, 0, sizeof(struct adv7170)); | ||
442 | encoder->norm = VIDEO_MODE_NTSC; | 440 | encoder->norm = VIDEO_MODE_NTSC; |
443 | encoder->input = 0; | 441 | encoder->input = 0; |
444 | encoder->enable = 1; | 442 | encoder->enable = 1; |