From: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Date: Wed, 17 Oct 2018 06:37:48 +0000 (-0700)
Subject: scsi: megaraid_sas: Fail init if heartbeat timer fails
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2e47e4e62e403340f5ea718ac2b0836ab9271134;p=linux.git

scsi: megaraid_sas: Fail init if heartbeat timer fails

When driver fails to start the heartbeat timer, exit from FW init.

Signed-off-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 688219404cae6..85c7d9912eea7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5694,10 +5694,12 @@ static int megasas_init_fw(struct megasas_instance *instance)
 
 	/* Launch SR-IOV heartbeat timer */
 	if (instance->requestorId) {
-		if (!megasas_sriov_start_heartbeat(instance, 1))
+		if (!megasas_sriov_start_heartbeat(instance, 1)) {
 			megasas_start_timer(instance);
-		else
+		} else {
 			instance->skip_heartbeat_timer_del = 1;
+			goto fail_get_ld_pd_list;
+		}
 	}
 
 	/*