diff options
| author | Panagiotis Issaris <takis@issaris.org> | 2006-01-11 19:40:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-11 19:40:56 -0200 |
| commit | 7408187d223f63d46a13b6a35b8f96b032c2f623 (patch) | |
| tree | 425a459f760295de488f57e3f97b034aaa76a78d /drivers/media/video/saa7114.c | |
| parent | 0b3af1b6df82cfdb54ae294ed860263011fa0408 (diff) | |
| download | op-kernel-dev-7408187d223f63d46a13b6a35b8f96b032c2f623.zip op-kernel-dev-7408187d223f63d46a13b6a35b8f96b032c2f623.tar.gz | |
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/saa7114.c')
| -rw-r--r-- | drivers/media/video/saa7114.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c index b7ac012..fd0a4b4 100644 --- a/drivers/media/video/saa7114.c +++ b/drivers/media/video/saa7114.c @@ -852,21 +852,19 @@ saa7114_detect_client (struct i2c_adapter *adapter, if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return 0; - client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL); + client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); if (client == 0) return -ENOMEM; - memset(client, 0, sizeof(struct i2c_client)); client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7114; strlcpy(I2C_NAME(client), "saa7114", sizeof(I2C_NAME(client))); - decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL); + decoder = kzalloc(sizeof(struct saa7114), GFP_KERNEL); if (decoder == NULL) { kfree(client); return -ENOMEM; } - memset(decoder, 0, sizeof(struct saa7114)); decoder->norm = VIDEO_MODE_NTSC; decoder->input = -1; decoder->enable = 1; |
