[PATCH 10/19] megaraid_sas: Fail init if heartbeat timer fails

[Shivasharan S]

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

Signed-off-by: Shivasharan S <shivasharan.srikanteshw...@broadcom.com>
---
 drivers/scsi/megaraid/megaraid_sas_base.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c 
b/drivers/scsi/megaraid/megaraid_sas_base.c
index 8de845f675b4..3cf9995c62ef 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5695,10 +5695,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;
+               }
        }
 
        /*
-- 
2.16.1