1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 2899d34e5f7..04c1938b9c9 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -109,10 +109,9 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
         struct page *pg;
         int i;
 
-        sglist = kmalloc(sizeof(struct scatterlist)*nr_pages, GFP_KERNEL);
+        sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
         if (NULL == sglist)
                 return NULL;
-        memset(sglist,0,sizeof(struct scatterlist)*nr_pages);
         for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) {
                 pg = vmalloc_to_page(virt);
                 if (NULL == pg)
@@ -306,15 +305,13 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
         struct saa7146_dev *dev;
         int err = -ENOMEM;
 
-        dev = kmalloc(sizeof(struct saa7146_dev), GFP_KERNEL);
+        /* clear out mem for sure */
+        dev = kzalloc(sizeof(struct saa7146_dev), GFP_KERNEL);
         if (!dev) {
                 ERR(("out of memory.\n"));
                 goto out;
         }
 
-        /* clear out mem for sure */
-        memset(dev, 0x0, sizeof(struct saa7146_dev));
-
         DEB_EE(("pci:%p\n",pci));
 
         err = pci_enable_device(pci);