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,
         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_adv7170;
@@ -433,12 +432,11 @@ adv7170_detect_client (struct i2c_adapter *adapter,
         }
         strlcpy(I2C_NAME(client), dname, sizeof(I2C_NAME(client)));
 
-        encoder = kmalloc(sizeof(struct adv7170), GFP_KERNEL);
+        encoder = kzalloc(sizeof(struct adv7170), GFP_KERNEL);
         if (encoder == NULL) {
                 kfree(client);
                 return -ENOMEM;
         }
-        memset(encoder, 0, sizeof(struct adv7170));
         encoder->norm = VIDEO_MODE_NTSC;
         encoder->input = 0;
         encoder->enable = 1;