hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/scsi/isci/task.c
....@@ -160,7 +160,7 @@
160160
161161 isci_task_refuse(ihost, task,
162162 SAS_TASK_UNDELIVERED,
163
- SAM_STAT_TASK_ABORTED);
163
+ SAS_SAM_STAT_TASK_ABORTED);
164164 } else {
165165 task->task_state_flags |= SAS_TASK_AT_INITIATOR;
166166 spin_unlock_irqrestore(&task->task_state_lock, flags);
....@@ -511,7 +511,7 @@
511511 "%s: dev = %p (%s%s), task = %p, old_request == %p\n",
512512 __func__, idev,
513513 (dev_is_sata(task->dev) ? "STP/SATA"
514
- : ((dev_is_expander(task->dev))
514
+ : ((dev_is_expander(task->dev->dev_type))
515515 ? "SMP"
516516 : "SSP")),
517517 ((idev) ? ((test_bit(IDEV_GONE, &idev->flags))