UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Shivasharan S 2018-10-16 23:37:48 -07:00 committed by Martin K. Petersen
parent 5acad9b9d9
commit 2e47e4e62e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@ -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;
}
}
/*