|
@@ -1050,11 +1050,11 @@ static int hisi_sas_exec_internal_tmf_task(struct domain_device *device,
|
|
|
if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
|
|
|
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
|
|
|
struct hisi_sas_slot *slot = task->lldd_task;
|
|
|
- struct hisi_sas_cq *cq =
|
|
|
- &hisi_hba->cq[slot->dlvry_queue];
|
|
|
|
|
|
dev_err(dev, "abort tmf: TMF task timeout and not done\n");
|
|
|
if (slot) {
|
|
|
+ struct hisi_sas_cq *cq =
|
|
|
+ &hisi_hba->cq[slot->dlvry_queue];
|
|
|
/*
|
|
|
* flush tasklet to avoid free'ing task
|
|
|
* before using task in IO completion
|
|
@@ -1875,10 +1875,10 @@ hisi_sas_internal_task_abort(struct hisi_hba *hisi_hba,
|
|
|
if ((task->task_state_flags & SAS_TASK_STATE_ABORTED)) {
|
|
|
if (!(task->task_state_flags & SAS_TASK_STATE_DONE)) {
|
|
|
struct hisi_sas_slot *slot = task->lldd_task;
|
|
|
- struct hisi_sas_cq *cq =
|
|
|
- &hisi_hba->cq[slot->dlvry_queue];
|
|
|
|
|
|
if (slot) {
|
|
|
+ struct hisi_sas_cq *cq =
|
|
|
+ &hisi_hba->cq[slot->dlvry_queue];
|
|
|
/*
|
|
|
* flush tasklet to avoid free'ing task
|
|
|
* before using task in IO completion
|