[SCSI] be2iscsi: Fix the function return values.

Signed-off-by: John Soni Jose <sony.john-n@emulex.com>
Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
index 00e297d..3f3a4a1 100644 (file)
--- a/drivers/scsi/be2iscsi/be_main.c
+++ b/drivers/scsi/be2iscsi/be_main.c
@@ -541,8 +541,7 @@ static int be_ctrl_init(struct beiscsi_hba *phba, struct pci_dev *pdev)
                                                  &mbox_mem_alloc->dma);
        if (!mbox_mem_alloc->va) {
                beiscsi_unmap_pci_function(phba);
-               status = -ENOMEM;
-               return status;
+               return -ENOMEM;
        }
 
        mbox_mem_align->size = sizeof(struct be_mcc_mailbox);
@@ -3209,7 +3208,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
 error:
        shost_printk(KERN_ERR, phba->shost, "hwi_init_port failed");
        hwi_cleanup(phba);
-       return -ENOMEM;
+       return status;
 }
 
 static int hwi_init_controller(struct beiscsi_hba *phba)
@@ -3284,7 +3283,7 @@ static int beiscsi_init_controller(struct beiscsi_hba *phba)
 
 free_init:
        beiscsi_free_mem(phba);
-       return -ENOMEM;
+       return ret;
 }
 
 static int beiscsi_init_sgl_handle(struct beiscsi_hba *phba)