From 1792e8874a97959a0a1245cd17b5dc64001aa4ca Mon Sep 17 00:00:00 2001 From: Jayamohan Kallickal Date: Tue, 3 Apr 2012 23:41:44 -0500 Subject: [PATCH] --- yaml --- r: 302459 b: refs/heads/master c: a49e06d58d91f170594af3f05454f43dbccae249 h: refs/heads/master i: 302457: eee04e6bbd940b2f55fdc028e4caa5f5448c9efe 302455: ce0cdcbd040a153d1fa521acf617e276a2de5d3c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/be2iscsi/be_main.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 38e95e811d37..3c8e23e73050 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db7f770968222c966e832eebc82b500b1e8ae6a1 +refs/heads/master: a49e06d58d91f170594af3f05454f43dbccae249 diff --git a/trunk/drivers/scsi/be2iscsi/be_main.c b/trunk/drivers/scsi/be2iscsi/be_main.c index 00e297d8d742..3f3a4a1652e6 100644 --- a/trunk/drivers/scsi/be2iscsi/be_main.c +++ b/trunk/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)