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

1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c
index 41f6f05a0436..746cadb8f1c4 100644
--- a/drivers/media/video/saa7191.c
+++ b/drivers/media/video/saa7191.c
@@ -571,18 +571,15 @@ static int saa7191_attach(struct i2c_adapter *adap, int addr, int kind)
         printk(KERN_INFO "Philips SAA7191 driver version %s\n",
                SAA7191_MODULE_VERSION);
 
-        client = kmalloc(sizeof(*client), GFP_KERNEL);
+        client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (!client)
                 return -ENOMEM;
-        decoder = kmalloc(sizeof(*decoder), GFP_KERNEL);
+        decoder = kzalloc(sizeof(*decoder), GFP_KERNEL);
         if (!decoder) {
                 err = -ENOMEM;
                 goto out_free_client;
         }
 
-        memset(client, 0, sizeof(struct i2c_client));
-        memset(decoder, 0, sizeof(struct saa7191));
-
         client->addr = addr;
         client->adapter = adap;
         client->driver = &i2c_driver_saa7191;