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

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 71b28e9e0850..c8fd8238904d 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -4499,13 +4499,11 @@ static int vino_init(void)
         dma_addr_t dma_dummy_address;
         int i;
 
-        vino_drvdata = (struct vino_settings *)
-                kmalloc(sizeof(struct vino_settings), GFP_KERNEL);
+        vino_drvdata = kzalloc(sizeof(struct vino_settings), GFP_KERNEL);
         if (!vino_drvdata) {
                 vino_module_cleanup(vino_init_stage);
                 return -ENOMEM;
         }
-        memset(vino_drvdata, 0, sizeof(struct vino_settings));
         vino_init_stage++;
 
         /* create a dummy dma descriptor */