Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index c4ba3742f5c7..4dcba5a4fff0 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -99,11 +99,10 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
         }
 
         /* allocate memory for client structure */
-        client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
+        client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
         if (0 == client) {
                 return -ENOMEM;
         }
-        memset(client, 0x0, sizeof(struct i2c_client));
 
         /* fill client structure */
         memcpy(client, &client_template, sizeof(struct i2c_client));