diff options
| author | Shivasharan S <shivasharan.srikanteshwara@broadcom.com> | 2018-10-17 09:37:48 +0300 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2018-11-07 04:33:57 +0300 |
| commit | 2e47e4e62e403340f5ea718ac2b0836ab9271134 (patch) | |
| tree | ad7173e8df927fb1233a00365173b67ce3965e1f /drivers/scsi/megaraid | |
| parent | 5acad9b9d90e02d17fa141ee0aff3678232a2bb1 (diff) | |
| download | linux-2e47e4e62e403340f5ea718ac2b0836ab9271134.tar.xz | |
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>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 688219404cae..85c7d9912eea 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; + } } /* |