1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 414350ab584e..ecebdfa00470 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -43,7 +43,6 @@
 #include "lpfc_crtn.h"
 #include "lpfc_vport.h"
 #include "lpfc_version.h"
-#include "lpfc_vport.h"
 
 static int lpfc_parse_vpd(struct lpfc_hba *, uint8_t *, int);
 static void lpfc_get_hba_model_desc(struct lpfc_hba *, uint8_t *, uint8_t *);
@@ -1266,11 +1265,10 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
         uint32_t *HashWorking;
         uint32_t *pwwnn = (uint32_t *) phba->wwnn;
 
-        HashWorking = kmalloc(80 * sizeof(uint32_t), GFP_KERNEL);
+        HashWorking = kcalloc(80, sizeof(uint32_t), GFP_KERNEL);
         if (!HashWorking)
                 return;
 
-        memset(HashWorking, 0, (80 * sizeof(uint32_t)));
         HashWorking[0] = HashWorking[78] = *pwwnn++;
         HashWorking[1] = HashWorking[79] = *pwwnn;