]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
be2iscsi:Add missing error check in beiscsi_eeh_resume
authorNicholas Krause <xerofoify@gmail.com>
Sat, 27 Feb 2016 17:43:25 +0000 (12:43 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 1 Mar 2016 02:06:31 +0000 (21:06 -0500)
This adds the missing error check and path for if the call to the
function hwi_init_controller fails as this error path was clearly missed
when writing beiscsi_eeh_resume and thus we must add it now in order to
be able to handle this nonrecoverable failing function call gracefully
in beiscsi_eeh_resume.

Signed-off-by: Nicholas Krause <xerofoify@gmail.com>
Reviewed-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/be2iscsi/be_main.c

index 7243a80b0d6d13ae34eaefcf88d352a0e5935950..b51e7263560df80770f3301888b6ba093f42da76 100644 (file)
@@ -5572,6 +5572,12 @@ static void beiscsi_eeh_resume(struct pci_dev *pdev)
        phba->shost->max_id = phba->params.cxns_per_ctrl;
        phba->shost->can_queue = phba->params.ios_per_ctrl;
        ret = hwi_init_controller(phba);
+       if (ret) {
+               beiscsi_log(phba, KERN_ERR, BEISCSI_LOG_INIT,
+                           "BM_%d : beiscsi_eeh_resume -"
+                            "Failed to initialize beiscsi_hba.\n");
+               goto ret_err;
+       }
 
        for (i = 0; i < MAX_MCC_CMD; i++) {
                init_waitqueue_head(&phba->ctrl.mcc_wait[i + 1]);