p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scsi: be2iscsi: Fix error return code 

We know that 'ret' is not an error code because it has been tested a few
lines above.  So, if one of these function fails, 0 will be returned
instead of an error code.  Return -ENOMEM instead.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

'ret' needs to be set with error code if hba_setup_cid_tbls fails.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Christophe JAILLET 2016-08-26 15:09:06 +05:30 committed by Martin K. Petersen
parent 51f9039ffd
commit deeea8edc7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/scsi/be2iscsi/be_main.c
View File

@ -3017,8 +3017,8 @@ static int be_fill_queue(struct be_queue_info *q,
static int beiscsi_create_eqs(struct beiscsi_hba *phba, static int beiscsi_create_eqs(struct beiscsi_hba *phba,
struct hwi_context_memory *phwi_context) struct hwi_context_memory *phwi_context)
{ {
int ret = -ENOMEM, eq_for_mcc;
unsigned int i, num_eq_pages; unsigned int i, num_eq_pages;
int ret = 0, eq_for_mcc;
struct be_queue_info *eq; struct be_queue_info *eq;
struct be_dma_mem *mem; struct be_dma_mem *mem;
void *eq_vaddress; void *eq_vaddress;
@ -3036,8 +3036,8 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
mem = &eq->dma_mem; mem = &eq->dma_mem;
phwi_context->be_eq[i].phba = phba; phwi_context->be_eq[i].phba = phba;
eq_vaddress = pci_alloc_consistent(phba->pcidev, eq_vaddress = pci_alloc_consistent(phba->pcidev,
num_eq_pages * PAGE_SIZE, num_eq_pages * PAGE_SIZE,
&paddr); &paddr);
if (!eq_vaddress) if (!eq_vaddress)
goto create_eq_error; goto create_eq_error;
@ -3065,6 +3065,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
phwi_context->be_eq[i].q.id); phwi_context->be_eq[i].q.id);
} }
return 0; return 0;
create_eq_error: create_eq_error:
for (i = 0; i < (phba->num_cpus + eq_for_mcc); i++) { for (i = 0; i < (phba->num_cpus + eq_for_mcc); i++) {
eq = &phwi_context->be_eq[i].q; eq = &phwi_context->be_eq[i].q;
@ -3081,11 +3082,11 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
struct hwi_context_memory *phwi_context) struct hwi_context_memory *phwi_context)
{ {
unsigned int i, num_cq_pages; unsigned int i, num_cq_pages;
int ret = 0;
struct be_queue_info *cq, *eq; struct be_queue_info *cq, *eq;
struct be_dma_mem *mem; struct be_dma_mem *mem;
struct be_eq_obj *pbe_eq; struct be_eq_obj *pbe_eq;
void *cq_vaddress; void *cq_vaddress;
int ret = -ENOMEM;
dma_addr_t paddr; dma_addr_t paddr;
num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries * \ num_cq_pages = PAGES_REQUIRED(phba->params.num_cq_entries * \
@ -3099,10 +3100,11 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
pbe_eq->phba = phba; pbe_eq->phba = phba;
mem = &cq->dma_mem; mem = &cq->dma_mem;
cq_vaddress = pci_alloc_consistent(phba->pcidev, cq_vaddress = pci_alloc_consistent(phba->pcidev,
num_cq_pages * PAGE_SIZE, num_cq_pages * PAGE_SIZE,
&paddr); &paddr);
if (!cq_vaddress) if (!cq_vaddress)
goto create_cq_error; goto create_cq_error;
ret = be_fill_queue(cq, phba->params.num_cq_entries, ret = be_fill_queue(cq, phba->params.num_cq_entries,
sizeof(struct sol_cqe), cq_vaddress); sizeof(struct sol_cqe), cq_vaddress);
if (ret) { if (ret) {
@ -3137,7 +3139,6 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
mem->va, mem->dma); mem->va, mem->dma);
} }
return ret; return ret;
} }
static int static int
@ -4230,7 +4231,8 @@ static int beiscsi_init_port(struct beiscsi_hba *phba)
goto do_cleanup_ctrlr; goto do_cleanup_ctrlr;
} }
if (hba_setup_cid_tbls(phba)) { ret = hba_setup_cid_tbls(phba);
if (ret < 0) {
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
"BM_%d : Failed in hba_setup_cid_tbls\n"); "BM_%d : Failed in hba_setup_cid_tbls\n");
kfree(phba->io_sgl_hndl_base); kfree(phba->io_sgl_hndl_base);
@ -5627,7 +5629,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
struct hwi_context_memory *phwi_context; struct hwi_context_memory *phwi_context;
struct be_eq_obj *pbe_eq; struct be_eq_obj *pbe_eq;
unsigned int s_handle; unsigned int s_handle;
int ret = 0, i; int ret, i;
ret = beiscsi_enable_pci(pcidev); ret = beiscsi_enable_pci(pcidev);
if (ret < 0) { if (ret < 0) {
@ -5640,6 +5642,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
if (!phba) { if (!phba) {
dev_err(&pcidev->dev, dev_err(&pcidev->dev,
"beiscsi_dev_probe - Failed in beiscsi_hba_alloc\n"); "beiscsi_dev_probe - Failed in beiscsi_hba_alloc\n");
ret = -ENOMEM;
goto disable_pci; goto disable_pci;
} }
@ -5744,6 +5747,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT, beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
"BM_%d : beiscsi_dev_probe-" "BM_%d : beiscsi_dev_probe-"
"Failed to allocate work queue\n"); "Failed to allocate work queue\n");
ret = -ENOMEM;
goto free_twq; goto free_twq;
} }