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 688219404cae6cadba38fb4af47e5254c2601c39..85c7d9912eea717d4dc81926e44c8ea3704af74f 100644 (file)
--- 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;
+               }
        }
 
        /*