6 files changed, 6 insertions, 12 deletions

diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index b3f4d266cede..c04130dab127 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -178,10 +178,9 @@ static int ov6x20_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;
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;
diff --git a/drivers/media/video/ovcamchip/ov76be.c b/drivers/media/video/ovcamchip/ov76be.c
index 29bbdc05e3b6..11f6be924d8b 100644
--- a/drivers/media/video/ovcamchip/ov76be.c
+++ b/drivers/media/video/ovcamchip/ov76be.c
@@ -105,10 +105,9 @@ static int ov76be_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;
diff --git a/drivers/media/video/ovcamchip/ov7x10.c b/drivers/media/video/ovcamchip/ov7x10.c
index 6c383d4b14fa..5206e7913924 100644
--- a/drivers/media/video/ovcamchip/ov7x10.c
+++ b/drivers/media/video/ovcamchip/ov7x10.c
@@ -115,10 +115,9 @@ static int ov7x10_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;
diff --git a/drivers/media/video/ovcamchip/ov7x20.c b/drivers/media/video/ovcamchip/ov7x20.c
index 3c8c48f338ba..8e26ae338f31 100644
--- a/drivers/media/video/ovcamchip/ov7x20.c
+++ b/drivers/media/video/ovcamchip/ov7x20.c
@@ -232,10 +232,9 @@ static int ov7x20_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 = DFL_AUTO_EXP;
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 428f1bb75ec3..e76b53d5909c 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -316,12 +316,11 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
         c->adapter = adap;
         strcpy(c->name, "OV????");
 
-        ov = kmalloc(sizeof *ov, GFP_KERNEL);
+        ov = kzalloc(sizeof *ov, GFP_KERNEL);
         if (!ov) {
                 rc = -ENOMEM;
                 goto no_ov;
         }
-        memset(ov, 0, sizeof *ov);
         i2c_set_clientdata(c, ov);
 
         rc = ovcamchip_detect(c);