1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index 60508069bbed..909b593530ed 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -316,21 +316,19 @@ bt856_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_bt856;
         strlcpy(I2C_NAME(client), "bt856", sizeof(I2C_NAME(client)));
 
-        encoder = kmalloc(sizeof(struct bt856), GFP_KERNEL);
+        encoder = kzalloc(sizeof(struct bt856), GFP_KERNEL);
         if (encoder == NULL) {
                 kfree(client);
                 return -ENOMEM;
         }
-        memset(encoder, 0, sizeof(struct bt856));
         encoder->norm = VIDEO_MODE_NTSC;
         encoder->enable = 1;
         i2c_set_clientdata(client, encoder);