1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/scsi/bfa/bfad_bsg.c b/drivers/scsi/bfa/bfad_bsg.c
index 8994fb857ee9..023b9d42ad9a 100644
--- a/drivers/scsi/bfa/bfad_bsg.c
+++ b/drivers/scsi/bfa/bfad_bsg.c
@@ -26,7 +26,6 @@ int
 bfad_iocmd_ioc_enable(struct bfad_s *bfad, void *cmd)
 {
         struct bfa_bsg_gen_s *iocmd = (struct bfa_bsg_gen_s *)cmd;
-        int     rc = 0;
         unsigned long   flags;
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
@@ -34,7 +33,7 @@ bfad_iocmd_ioc_enable(struct bfad_s *bfad, void *cmd)
         if (!bfa_ioc_is_disabled(&bfad->bfa.ioc)) {
                 spin_unlock_irqrestore(&bfad->bfad_lock, flags);
                 iocmd->status = BFA_STATUS_OK;
-                return rc;
+                return 0;
         }
 
         init_completion(&bfad->enable_comp);
@@ -43,21 +42,20 @@ bfad_iocmd_ioc_enable(struct bfad_s *bfad, void *cmd)
         spin_unlock_irqrestore(&bfad->bfad_lock, flags);
         wait_for_completion(&bfad->enable_comp);
 
-        return rc;
+        return 0;
 }
 
 int
 bfad_iocmd_ioc_disable(struct bfad_s *bfad, void *cmd)
 {
         struct bfa_bsg_gen_s *iocmd = (struct bfa_bsg_gen_s *)cmd;
-        int     rc = 0;
         unsigned long   flags;
 
         spin_lock_irqsave(&bfad->bfad_lock, flags);
         if (bfa_ioc_is_disabled(&bfad->bfa.ioc)) {
                 spin_unlock_irqrestore(&bfad->bfad_lock, flags);
                 iocmd->status = BFA_STATUS_OK;
-                return rc;
+                return 0;
         }
 
         if (bfad->disable_active) {
@@ -74,7 +72,7 @@ bfad_iocmd_ioc_disable(struct bfad_s *bfad, void *cmd)
         bfad->disable_active = BFA_FALSE;
         iocmd->status = BFA_STATUS_OK;
 
-        return rc;
+        return 0;
 }
 
 static int
@@ -3270,13 +3268,13 @@ bfad_fcxp_map_sg(struct bfad_s *bfad, void *payload_kbuf,
         /* Allocate dma coherent memory */
         buf_info = buf_base;
         buf_info->size = payload_len;
-        buf_info->virt = dma_alloc_coherent(&bfad->pcidev->dev, buf_info->size,
-                                        &buf_info->phys, GFP_KERNEL);
+        buf_info->virt = dma_zalloc_coherent(&bfad->pcidev->dev,
+                                             buf_info->size, &buf_info->phys,
+                                             GFP_KERNEL);
         if (!buf_info->virt)
                 goto out_free_mem;
 
         /* copy the linear bsg buffer to buf_info */
-        memset(buf_info->virt, 0, buf_info->size);
         memcpy(buf_info->virt, payload_kbuf, buf_info->size);
 
         /*