Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 014085d8ec85..0b1b72825ae2 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -411,14 +411,12 @@ mpt_lan_open(struct net_device *dev)
                 goto out;
         priv->mpt_txfidx_tail = -1;
 
-        priv->SendCtl = kmalloc(priv->tx_max_out * sizeof(struct BufferControl),
+        priv->SendCtl = kcalloc(priv->tx_max_out, sizeof(struct BufferControl),
                                 GFP_KERNEL);
         if (priv->SendCtl == NULL)
                 goto out_mpt_txfidx;
-        for (i = 0; i < priv->tx_max_out; i++) {
-                memset(&priv->SendCtl[i], 0, sizeof(struct BufferControl));
+        for (i = 0; i < priv->tx_max_out; i++)
                 priv->mpt_txfidx[++priv->mpt_txfidx_tail] = i;
-        }
 
         dlprintk((KERN_INFO MYNAM "@lo: Finished initializing SendCtl\n"));
 
@@ -428,15 +426,13 @@ mpt_lan_open(struct net_device *dev)
                 goto out_SendCtl;
         priv->mpt_rxfidx_tail = -1;
 
-        priv->RcvCtl = kmalloc(priv->max_buckets_out *
-                                                sizeof(struct BufferControl),
+        priv->RcvCtl = kcalloc(priv->max_buckets_out,
+                               sizeof(struct BufferControl),
                                GFP_KERNEL);
         if (priv->RcvCtl == NULL)
                 goto out_mpt_rxfidx;
-        for (i = 0; i < priv->max_buckets_out; i++) {
-                memset(&priv->RcvCtl[i], 0, sizeof(struct BufferControl));
+        for (i = 0; i < priv->max_buckets_out; i++)
                 priv->mpt_rxfidx[++priv->mpt_rxfidx_tail] = i;
-        }
 
 /**/    dlprintk((KERN_INFO MYNAM "/lo: txfidx contains - "));
 /**/    for (i = 0; i < priv->tx_max_out; i++)