diff --git a/drivers/scsi/huawei/hifc/unf_scsi.c b/drivers/scsi/huawei/hifc/unf_scsi.c
index f0f613a51be3adeeba8f0ec38c3e1105e775559d..efcac82a369960b178e41376e51c825f0f7f7b3d 100644
--- a/drivers/scsi/huawei/hifc/unf_scsi.c
+++ b/drivers/scsi/huawei/hifc/unf_scsi.c
@@ -408,7 +408,7 @@ struct fc_function_template function_template = {
 	.show_starget_port_id = 1,
 
 	.set_rport_dev_loss_tmo = unf_set_rport_loss_tmo,
-	.show_rport_dev_loss_tmo = 0,
+	.show_rport_dev_loss_tmo = 1,
 
 	.issue_fc_host_lip = NULL,
 	.dev_loss_tmo_callbk = unf_dev_loss_timeout_callbk,
diff --git a/drivers/scsi/huawei/hifc/unf_service.c b/drivers/scsi/huawei/hifc/unf_service.c
index 208954bfbe0b0a53598d226ae21138efd96ff1ab..a202d7111c608ec86a307c41bc003217ad294669 100644
--- a/drivers/scsi/huawei/hifc/unf_service.c
+++ b/drivers/scsi/huawei/hifc/unf_service.c
@@ -1155,7 +1155,7 @@ static void unf_logo_ob_callback(struct unf_xchg_s *v_xchg)
 	unsigned int nport_id = 0;
 	unsigned int logo_retry = 0;
 
-	UNF_CHECK_VALID(0x3675, UNF_TRUE, NULL, return);
+	UNF_CHECK_VALID(0x3675, UNF_TRUE, v_xchg, return);
 	xchg = v_xchg;
 	old_rport = xchg->rport;
 	logo_retry = old_rport->logo_retries;