1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 38fc054bd671..5f25e5efefcd 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1784,7 +1784,7 @@ static int __devinit fs_init (struct fs_dev *dev)
                 write_fs (dev, RAM, (1 << (28 - FS155_VPI_BITS - FS155_VCI_BITS)) - 1);
                 dev->nchannels = FS155_NR_CHANNELS;
         }
-        dev->atm_vccs = kmalloc (dev->nchannels * sizeof (struct atm_vcc *), 
+        dev->atm_vccs = kcalloc (dev->nchannels, sizeof (struct atm_vcc *),
                                  GFP_KERNEL);
         fs_dprintk (FS_DEBUG_ALLOC, "Alloc atmvccs: %p(%Zd)\n",
                     dev->atm_vccs, dev->nchannels * sizeof (struct atm_vcc *));
@@ -1794,9 +1794,8 @@ static int __devinit fs_init (struct fs_dev *dev)
                 /* XXX Clean up..... */
                 return 1;
         }
-        memset (dev->atm_vccs, 0, dev->nchannels * sizeof (struct atm_vcc *));
 
-        dev->tx_inuse = kmalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);
+        dev->tx_inuse = kzalloc (dev->nchannels / 8 /* bits/byte */ , GFP_KERNEL);
         fs_dprintk (FS_DEBUG_ALLOC, "Alloc tx_inuse: %p(%d)\n", 
                     dev->atm_vccs, dev->nchannels / 8);
 
@@ -1805,8 +1804,6 @@ static int __devinit fs_init (struct fs_dev *dev)
                 /* XXX Clean up..... */
                 return 1;
         }
-        memset (dev->tx_inuse, 0, dev->nchannels / 8);
-
         /* -- RAS1 : FS155 and 50 differ. Default (0) should be OK for both */
         /* -- RAS2 : FS50 only: Default is OK. */
 
@@ -1893,14 +1890,11 @@ static int __devinit firestream_init_one (struct pci_dev *pci_dev,
         if (pci_enable_device(pci_dev)) 
                 goto err_out;
 
-        fs_dev = kmalloc (sizeof (struct fs_dev), GFP_KERNEL);
+        fs_dev = kzalloc (sizeof (struct fs_dev), GFP_KERNEL);
         fs_dprintk (FS_DEBUG_ALLOC, "Alloc fs-dev: %p(%Zd)\n",
                     fs_dev, sizeof (struct fs_dev));
         if (!fs_dev)
                 goto err_out;
-
-        memset (fs_dev, 0, sizeof (struct fs_dev));
-  
         atm_dev = atm_dev_register("fs", &ops, -1, NULL);
         if (!atm_dev)
                 goto err_out_free_fs_dev;