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/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 6eab458ab792..73b94f51a85a 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -141,10 +141,9 @@ static int ov6x30_init(struct i2c_client *c)
         if (rc < 0)
                 return rc;
 
-        ov->spriv = s = kmalloc(sizeof *s, GFP_KERNEL);
+        ov->spriv = s = kzalloc(sizeof *s, GFP_KERNEL);
         if (!s)
                 return -ENOMEM;
-        memset(s, 0, sizeof *s);
 
         s->auto_brt = 1;
         s->auto_exp = 1;